Split build: Revert it for now.

49 files changed, 69 insertions, 554 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7a7ce93da047..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/buildenv
-/config.log
-/config.parms
-/config.status
-/configure
-/install-sh
-/logfile.log
-/missing
-/OpenOffice
-/solver
-
-/*/unxlng??.pro
-
-localize.sdf
-
-# temp files
-.*.swp
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 120da2f2d9ec..000000000000
--- a/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-http://www.openoffice.org/welcome/credits.html
diff --git a/COPYING b/COPYING
deleted file mode 100644
index cca7fc278f5c..000000000000
--- a/COPYING
+++ /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/ChangeLog b/ChangeLog
deleted file mode 100644
index 73c8beb9f16d..000000000000
--- a/ChangeLog
+++ /dev/null
@@ -1 +0,0 @@
-Please see the output of git log.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index d3c5b40a9409..000000000000
--- a/INSTALL
+++ /dev/null
@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 13657163c5e1..000000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# few needed variables
-
-stampdir = $(top_builddir)/build/stamp
-pkgconfigdir = $(libdir)/pkgconfig
-ooo_prefix = @OOO_PREFIX@
-solenvdir = $(ooo_prefix)/solenv
-solverdir = $(ooo_prefix)/solver
-buildsolverdir = "@abs_builddir@/solver"
-
-# the predefined rules
-
-include $(solverdir)/Makefile.common
-
-# what to add to the package
-
-# TODO
-EXTRA_DIST = 
-
-dist-hook: dist-hook-common
-
-# rules to execute
-
-all-local: $(stampdir)/all
-
-# TODO
-clean-local:
-
-# TODO
-distclean-local:
-
-install-data-local: $(stampdir)/all install-data-common
-	$(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-libs-extern.pc $(DESTDIR)$(pkgconfigdir)/
-
-$(stampdir)/all: buildenv all-common
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/NEWS
+++ /dev/null
diff --git a/README b/README
deleted file mode 100644
index 1da9de648140..000000000000
--- a/README
+++ /dev/null
@@ -1,11 +0,0 @@
-OpenOffice.org - split build
-============================
-
-This package provides the possibility to build OpenOffice.org by pieces.  This
-one contains the 3rd party libraries needed for the OOo build.
-
-To build, do the usual
-
-./autogen.sh or ./configure
-make
-make install
diff --git a/afms/prj/build.lst b/afms/prj/build.lst
index ec184cc2f900..ed3d01fd2909 100644
--- a/afms/prj/build.lst
+++ b/afms/prj/build.lst
@@ -1,3 +1,3 @@
-af	afms : NULL
+af	afms : solenv NULL
 af	afms		usr1	-	all	af_mkout NULL
 af	afms		nmake	-	all	af_fonts NULL
diff --git a/agg/prj/build.lst b/agg/prj/build.lst
index 533977decbdb..d1456c605f32 100755
--- a/agg/prj/build.lst
+++ b/agg/prj/build.lst
@@ -1,4 +1,4 @@
-ag	agg	:	xml2cmp NULL
+ag	agg	:	sal xml2cmp soltools NULL
 ag	agg										usr1	-	all	ag_mkout NULL
 ag	agg\inc									get		-	all	ag_inc NULL
 ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/apple_remote/prj/build.lst b/apple_remote/prj/build.lst
index 455eeecd5c20..ff4ee577408a 100644
--- a/apple_remote/prj/build.lst
+++ b/apple_remote/prj/build.lst
@@ -1,2 +1,2 @@
-apr	apple_remote :	NULL
+apr	apple_remote :	solenv	soltools NULL
 apr	apple_remote	nmake	-	u	apr_aprem	NULL
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 8183a7fb3151..000000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-aclocal $ACLOCAL_FLAGS || exit 1
-automake --gnu --add-missing --copy || exit 1
-autoconf || exit 1
-
-if test "x$NOCONFIGURE" = "x"; then
-    ./configure "$@"
-else
-    echo "Skipping configure process."
-fi
diff --git a/beanshell/prj/build.lst b/beanshell/prj/build.lst
index ea40e29e8cd1..2a1401b3fbeb 100644
--- a/beanshell/prj/build.lst
+++ b/beanshell/prj/build.lst
@@ -1,3 +1,3 @@
-be	beanshell	:	NULL
+be	beanshell	:	solenv NULL
 be	beanshell							usr1		-	all	be_mkout				NULL
 be	beanshell							nmake		-	all	be_beanshell		NULL
diff --git a/build/prj/build.lst b/build/prj/build.lst
deleted file mode 100644
index a4120e4d480b..000000000000
--- a/build/prj/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-be build : afms AGG:agg BSH:beanshell cppunit EPM:epm external fondu HSQLDB:hsqldb hyphen icc SYSTRAY_GTK:libegg libtextcat LIBWPD:libwpd LIBXMLSEC:libxmlsec LPSOLVE:lpsolve LUCENE:lucene MSFONTEXTRACT:msfontextract np_sdk OPENSSL:openssl REDLAND:redland rhino SANE:sane TWAIN:twain UNIXODBC:unixODBC VIGRA:vigra xsltml X11_EXTENSIONS:x11_extensions NULL
diff --git a/build/src/.gitignore b/build/src/.gitignore
deleted file mode 100644
index 840ea15df3d4..000000000000
--- a/build/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/OpenOffice.org-*.pc
diff --git a/build/src/OpenOffice.org-libs-extern.pc.in b/build/src/OpenOffice.org-libs-extern.pc.in
deleted file mode 100644
index e7aeeca6188e..000000000000
--- a/build/src/OpenOffice.org-libs-extern.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-
-Name: OpenOffice.org 3rd party system libraries
-Description: OpenOffice.org 3rd party system libraries package
-Version: @PACKAGE_VERSION@
diff --git a/build/stamp/.gitignore b/build/stamp/.gitignore
deleted file mode 100644
index a9a95e9fb014..000000000000
--- a/build/stamp/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
-!/README.txt
-!/.gitignore
diff --git a/build/stamp/README.txt b/build/stamp/README.txt
deleted file mode 100644
index a28c9d7c578e..000000000000
--- a/build/stamp/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory is for storing the stamps generated by the toplevel Makefile.
diff --git a/buildenv.in b/buildenv.in
deleted file mode 100644
index 6c6c26e28a95..000000000000
--- a/buildenv.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# Source this if you want to use build.pl directly, like:
-# . buildenv
-# or
-# source buildenv
-
-ooo_prefix="@OOO_PREFIX@"
-solverdir="$ooo_prefix/solver"
-buildsolverdir="@abs_builddir@/solver"
-
-. "$solverdir"/buildenv-common
diff --git a/configure.in b/configure.in
deleted file mode 100644
index b42b655a1fdf..000000000000
--- a/configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl Version X.Y.A.M
-dnl   X.Y - version
-dnl   A   - minor, or 97 for devel, 98 for alpha, 99 for beta
-dnl   M   - milestone, or micro version
-AC_INIT(OpenOffice.org-libs-extern-sys,3.1.97.50)
-
-AM_INIT_AUTOMAKE([1.8b tar-ustar])
-PKG_PROG_PKG_CONFIG
-
-dnl Where should be the OOo installed
-PKG_CHECK_MODULES(OOO_BOOTSTRAP,OpenOffice.org-bootstrap)
-OOO_PREFIX=$($PKG_CONFIG --variable=ooo_prefix OpenOffice.org-bootstrap)
-AC_SUBST(OOO_PREFIX)
-
-dnl OpenOffice.org build dependencies
-PKG_CHECK_MODULES(OOO_URE,OpenOffice.org-ure)
-
-dnl Create what is necessary
-AC_OUTPUT([Makefile buildenv build/src/OpenOffice.org-libs-extern.pc])
diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst
index 19b8cded9ee3..a1cce90ce3d4 100644
--- a/cppunit/prj/build.lst
+++ b/cppunit/prj/build.lst
@@ -1,3 +1,3 @@
-c5t  cppunit   :  NULL
+c5t  cppunit   :  sal NULL
 c5t  cppunit					usr1	- all  c5t_mkout NULL
 c5t  cppunit     				nmake	- all  c5t_make NULL
diff --git a/epm/prj/build.lst b/epm/prj/build.lst
index 4a0d9cc0c72f..1086d14c7224 100644
--- a/epm/prj/build.lst
+++ b/epm/prj/build.lst
@@ -1,2 +1,2 @@
-ep	epm	:	NULL
+ep	epm	:	solenv NULL
 ep	epm				nmake	-	u		ep_mkout NULL
diff --git a/external/prj/build.lst b/external/prj/build.lst
index 1a7735463fdb..b187dafaf667 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -1,4 +1,4 @@
-el      external :       SO:external_so NULL
+el      external :       SO:external_so soltools NULL
 el	external					usr1 - all el_mkout NULL
 el	external\glibc		nmake	-	all	el_glibc NULL
 el	external\gpc		nmake	-	all	el_gpc NULL
diff --git a/fondu/prj/build.lst b/fondu/prj/build.lst
index bef4227f1749..d99a2c230c02 100644
--- a/fondu/prj/build.lst
+++ b/fondu/prj/build.lst
@@ -1,2 +1,2 @@
-fd      fondu :       NULL
+fd      fondu :       solenv NULL
 fd	fondu		nmake	-	u	fd_fondu NULL
diff --git a/hsqldb/prj/build.lst b/hsqldb/prj/build.lst
index 6dec1e936496..a7c06234df7f 100755
--- a/hsqldb/prj/build.lst
+++ b/hsqldb/prj/build.lst
@@ -1,2 +1,2 @@
-hs	hsqldb	:	NULL
+hs	hsqldb	:	solenv NULL
 hs	hsqldb			nmake	-	all	hs_mkout NULL
diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst
index b58cf2560bf0..dbb21f3325ab 100644
--- a/hyphen/prj/build.lst
+++ b/hyphen/prj/build.lst
@@ -1,3 +1,3 @@
-hyp	hyphen	:	NULL
+hyp	hyphen	:	solenv sal NULL
 hyp     hyphen              usr1    -       all hyp_mkout NULL
 hyp     hyphen              nmake   -       all hyp_hyphen NULL
diff --git a/icc/prj/build.lst b/icc/prj/build.lst
index 4e0574859f54..7ce035bd4d92 100644
--- a/icc/prj/build.lst
+++ b/icc/prj/build.lst
@@ -1,3 +1,3 @@
-ip     icc :	external NULL
+ip     icc :	solenv external NULL
 ip	icc		usr1	-	all	ip_mkout NULL
 ip	icc		nmake	-	all	ip_icc	NULL
diff --git a/libegg/prj/build.lst b/libegg/prj/build.lst
index a8d23342af2e..a4cb56a1c0c9 100644
--- a/libegg/prj/build.lst
+++ b/libegg/prj/build.lst
@@ -1,2 +1,2 @@
-eg  libegg   :  NULL
+eg  libegg   :  soltools NULL
 eg	libegg\source			    nmake	-	u	eg_src NULL
diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst
index 8a5efd10d5cc..e4bc4af795aa 100644
--- a/libtextcat/prj/build.lst
+++ b/libtextcat/prj/build.lst
@@ -1,3 +1,3 @@
-ltc	libtextcat	:	NULL
+ltc	libtextcat	:	solenv sal NULL
 ltc     libtextcat              usr1    -       all ltc_mkout NULL
 ltc     libtextcat              nmake   -       all ltc_libtextcat NULL
diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst
index fe5f5bc339ce..1da425b02ab3 100644
--- a/libwpd/prj/build.lst
+++ b/libwpd/prj/build.lst
@@ -1,3 +1,3 @@
-lw	libwpd	: NULL
+lw	libwpd	: soltools NULL
 lw	libwpd	usr1	-	all	lw_mkout NULL
 lw	libwpd	nmake	-	all	lw_libwpd NULL
diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
index 11fa0217c366..b557aa31ccb5 100644
--- a/libxmlsec/prj/build.lst
+++ b/libxmlsec/prj/build.lst
@@ -1,3 +1,3 @@
-ls  libxmlsec   : LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL
+ls  libxmlsec   : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt sal NULL
 ls	libxmlsec			    usr1	-	all	ls_mkout NULL
 ls	libxmlsec			    nmake	-	all	ls_xmlsec1 NULL
diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst
index b438993462c9..516f37ae9f1c 100644
--- a/lpsolve/prj/build.lst
+++ b/lpsolve/prj/build.lst
@@ -1,3 +1,3 @@
-lps	lpsolve	: NULL
+lps	lpsolve	: sal NULL
 lps	lpsolve		usr1	-	all	lps_mkout NULL
 lps	lpsolve		nmake	-	all	lps_lpsolve NULL
diff --git a/lucene/prj/build.lst b/lucene/prj/build.lst
index a370550ef182..9f51b60f03c5 100644
--- a/lucene/prj/build.lst
+++ b/lucene/prj/build.lst
@@ -1,3 +1,3 @@
-xh      lucene  :  EXPAT:expat NULL
+xh      lucene  :  soltools EXPAT:expat NULL
 xh      lucene     usr1           -       all     xh_mkout NULL
 xh      lucene     nmake          -       all     xh_lucene NULL
diff --git a/msfontextract/prj/build.lst b/msfontextract/prj/build.lst
index 26469f486eb0..7b52864f0c75 100644
--- a/msfontextract/prj/build.lst
+++ b/msfontextract/prj/build.lst
@@ -1,2 +1,2 @@
-mf      msfontextract : NULL
+mf      msfontextract : soltools sal NULL
 mf	msfontextract						nmake	-	all	mf_mkout NULL
diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst
index af15fed304f7..01dbd7b0095b 100644
--- a/np_sdk/prj/build.lst
+++ b/np_sdk/prj/build.lst
@@ -1,3 +1,3 @@
-np  np_sdk : NULL
+np  np_sdk : soltools	NULL
 np	np_sdk			usr1	-	all	np_sdk NULL
 np	np_sdk\mozsrc	nmake	-	all	np_mozsrc NULL
diff --git a/openssl/prj/build.lst b/openssl/prj/build.lst
index 0a8f19206de2..756d0ed72960 100644
--- a/openssl/prj/build.lst
+++ b/openssl/prj/build.lst
@@ -1,3 +1,3 @@
-ssl      openssl  :  external EXPAT:expat NULL
+ssl      openssl  :  soltools external EXPAT:expat NULL
 ssl      openssl     usr1           -       all     ssl_mkout NULL
 ssl      openssl     nmake          -       all     ssl_openssl NULL 
diff --git a/redland/prj/build.lst b/redland/prj/build.lst
index 2420ec97a649..a5653f0cf5d4 100644
--- a/redland/prj/build.lst
+++ b/redland/prj/build.lst
@@ -1,4 +1,4 @@
-rld	redland	: ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
+rld	redland	: sal soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
 rld	redland				usr1	-	all	rld_mkout	NULL
 rld	redland\raptor		nmake	-	all	rld_raptor	NULL
 rld	redland\rasqal		nmake	-	all	rld_rasqal	rld_raptor NULL
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index 9fd89698fc8f..03bbd21147ea 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -15,3 +15,4 @@ symlink: %_DEST%\lib%_EXT%\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.dylib
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
+..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index ee4d7e63f9f9..12479a355f00 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -46,7 +46,7 @@ all:
 
 # --- Files --------------------------------------------------------
 
-.INCLUDE :	redlandversion.mk
+.INCLUDE :	../redlandversion.mk
 
 RAPTORVERSION=$(RAPTOR_MAJOR).4.17
 
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 353b08ecd47b..e739671eef13 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -46,7 +46,7 @@ all:
 
 # --- Files --------------------------------------------------------
 
-.INCLUDE :	redlandversion.mk
+.INCLUDE :	../redlandversion.mk
 
 RASQALVERSION=0.9.15
 
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 9280e85560db..e8b473769821 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -46,7 +46,7 @@ all:
 
 # --- Files --------------------------------------------------------
 
-.INCLUDE :	redlandversion.mk
+.INCLUDE :	../redlandversion.mk
 
 REDLANDVERSION=1.0.7
 
diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk
new file mode 100644
index 000000000000..9b7f73665c9b
--- /dev/null
+++ b/redland/redlandversion.mk
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# 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: redlandversion.mk,v $
+#
+# $Revision: 1.1 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+RAPTOR_MAJOR=1
+# rasqal has no stable abi
+RASQAL_MAJOR=0
+# redland has no stable abi
+REDLAND_MAJOR=0
+
diff --git a/rhino/prj/build.lst b/rhino/prj/build.lst
index 04ebecb7ddd6..d23bc3660d7e 100644
--- a/rhino/prj/build.lst
+++ b/rhino/prj/build.lst
@@ -1,3 +1,3 @@
-xh	rhino	:	NULL
+xh	rhino	:	soltools NULL
 xh	rhino		usr1	-	all	xh_mkout NULL
 xh	rhino      nmake	-	all	xh_rhino NULL
diff --git a/sane/prj/build.lst b/sane/prj/build.lst
index 83bfa7f89d25..c1c6fb90bfdc 100644
--- a/sane/prj/build.lst
+++ b/sane/prj/build.lst
@@ -1,3 +1,3 @@
-sa	sane	:	NULL
+sa	sane	:	solenv NULL
 sa	sane							usr1	-	all	sa_mkout NULL
 sa	sane\prj						get		-	all	sa_prj NULL
diff --git a/twain/prj/build.lst b/twain/prj/build.lst
index 44a83f2c5807..cfeab258dc06 100644
--- a/twain/prj/build.lst
+++ b/twain/prj/build.lst
@@ -1,3 +1,3 @@
-tw	twain	:	NULL
+tw	twain	:	solenv NULL
 tw	twain							usr1	-	all	tw_mkout NULL
 tw  twain\util nmake - n tw_util NULL
diff --git a/unixODBC/prj/build.lst b/unixODBC/prj/build.lst
index 6a5dd6edafa9..2adf385130db 100644
--- a/unixODBC/prj/build.lst
+++ b/unixODBC/prj/build.lst
@@ -1,3 +1,3 @@
-uo	unixODBC	:	NULL
+uo	unixODBC	:	solenv NULL
 uo	unixODBC							usr1	-	all	uo_mkout NULL
 uo	unixODBC\prj						get		-	all	uo_prj NULL
diff --git a/vigra/prj/build.lst b/vigra/prj/build.lst
index 5c29164040ac..47f7eee92782 100644
--- a/vigra/prj/build.lst
+++ b/vigra/prj/build.lst
@@ -1,3 +1,3 @@
-vi      vigra : NULL
+vi      vigra : solenv NULL
 vi      vigra           usr1    -       all     vi_mkout NULL
 vi      vigra           nmake   -       all     vi_vigra NULL
diff --git a/x11_extensions/prj/build.lst b/x11_extensions/prj/build.lst
index 4c9b6a39d53a..c4d6b1db0f33 100644
--- a/x11_extensions/prj/build.lst
+++ b/x11_extensions/prj/build.lst
@@ -1,3 +1,3 @@
-x1  x11_extensions : NULL
+x1  x11_extensions : solenv NULL
 x1  x11_extensions                         usr1    -   u     x11_mkout NULL
 
diff --git a/xsltml/prj/build.lst b/xsltml/prj/build.lst
index 0c04a34c024d..fe09f17613e3 100755
--- a/xsltml/prj/build.lst
+++ b/xsltml/prj/build.lst
@@ -1,3 +1,3 @@
-xm  xsltml :	external NULL
+xm  xsltml :	solenv external NULL
 xm	xsltml		usr1	-	all	xm_mkout    NULL
 xm	xsltml		nmake	-	all	xm_xsltml   NULL