Split build: Revert it for now.

43 files changed, 39 insertions, 568 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7a7ce93da..000000000
--- 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 120da2f2d..000000000
--- 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 cca7fc278..000000000
--- 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 73c8beb9f..000000000
--- 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 d3c5b40a9..000000000
--- 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 3d3ced8f7..000000000
--- 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-ure.pc $(DESTDIR)$(pkgconfigdir)/
-
-$(stampdir)/all: buildenv all-common
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29bb..000000000
--- a/NEWS
+++ /dev/null
diff --git a/README b/README
deleted file mode 100644
index cbf52ecfe..000000000
--- a/README
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenOffice.org - split build
-============================
-
-This package provides the possibility to build OpenOffice.org by pieces.  This
-one is the URE (UNO Runtime Environment) stuff that you need to be able to
-build the rest of the OOo.
-
-To build, do the usual
-
-./autogen.sh or ./configure
-make
-make install
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 8183a7fb3..000000000
--- 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/bridges/unotypes/makefile.mk b/bridges/unotypes/makefile.mk
index 2bc7b936c..cf6420bb6 100644
--- a/bridges/unotypes/makefile.mk
+++ b/bridges/unotypes/makefile.mk
@@ -40,8 +40,8 @@ TARGET=unotypes
 #-------------------------------------------------------------------
 
 CPPUMAKERFLAGS += -C
-UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb 
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb 
 UNOUCROUT=$(OUT)$/inc
 
 UNOTYPES = \
diff --git a/build/prj/build.lst b/build/prj/build.lst
deleted file mode 100644
index 663e5e435..000000000
--- a/build/prj/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-bu build : bridges cli_ure codemaker cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk offapi offuh OOo:pyuno rdbmaker registry remotebridges ridljar sal salhelper stoc store udkapi unoil ure xml2cmp NULL
diff --git a/build/src/.gitignore b/build/src/.gitignore
deleted file mode 100644
index 840ea15df..000000000
--- a/build/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/OpenOffice.org-*.pc
diff --git a/build/src/OpenOffice.org-ure.pc.in b/build/src/OpenOffice.org-ure.pc.in
deleted file mode 100644
index 5f7ccb3ec..000000000
--- a/build/src/OpenOffice.org-ure.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-
-Name: OpenOffice.org URE
-Description: OpenOffice.org URE package
-Version: @PACKAGE_VERSION@
diff --git a/build/stamp/.gitignore b/build/stamp/.gitignore
deleted file mode 100644
index a9a95e9fb..000000000
--- 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 a28c9d7c5..000000000
--- 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 6c6c26e28..000000000
--- 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/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index 144c22f95..007a01aec 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -1,4 +1,4 @@
-ure	cli_ure	:	cppu cppuhelper sal codemaker stoc udkapi NULL
+ure	cli_ure	:	cppu cppuhelper sal codemaker stoc udkapi tools NULL
 ure	cli_ure						usr1	-	all	ure_mkout NULL
 ure	cli_ure\inc					nmake   -   all   ure_inc NULL
 ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 914eb54fb..000000000
--- a/configure.in
+++ /dev/null
@@ -1,16 +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-ure,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 Create what is necessary
-AC_OUTPUT([Makefile buildenv build/src/OpenOffice.org-ure.pc])
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index 84c7710d2..17dad41fa 100644
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -51,7 +51,7 @@ UNIXVERSIONNAMES=UDK
 
 # --- Files --------------------------------------------------------
 
-UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 UNOUCRDEP=$(UNOUCRRDB)
 UNOUCROUT=$(OUT)$/inc$/$(TARGET)
 INCPRE+=$(OUT)$/inc$/$(TARGET) $(OUT)$/inc$/private
diff --git a/cppuhelper/unotypes/makefile.mk b/cppuhelper/unotypes/makefile.mk
index ce34e0da1..c2c835d9e 100644
--- a/cppuhelper/unotypes/makefile.mk
+++ b/cppuhelper/unotypes/makefile.mk
@@ -40,7 +40,7 @@ UNOUCRRDB = $(BIN)$/$(TARGET).rdb
 UNOUCRDEP = $(UNOUCRRDB)
 UNOUCROUT = $(OUT)$/inc$/private
 
-CPPUMAKERFLAGS += -C -X$(BUILDSOLARBINDIR)$/types.rdb
+CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
 
 UNOTYPES = \
     cppuhelper.detail.XExceptionThrower
@@ -50,7 +50,7 @@ ALLIDLFILES = \
 
 .INCLUDE : target.mk
 
-$(UNOUCRRDB) : $(ALLIDLFILES) $(BUILDSOLARBINDIR)$/types.rdb
-    $(IDLC) -I. -I$(BUILDSOLARIDLDIR) -O$(UCR) $(ALLIDLFILES)
+$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARBINDIR)$/types.rdb
+    $(IDLC) -I. -I$(SOLARIDLDIR) -O$(UCR) $(ALLIDLFILES)
     $(REGMERGE) $@ /UCR $(UCR)$/{$(?:f:s/.idl/.urd/)}
     touch $@
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk
index 471864d4b..e03df0265 100644
--- a/cpputools/source/registercomponent/makefile.mk
+++ b/cpputools/source/registercomponent/makefile.mk
@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 
-UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 NO_OFFUH=TRUE
 CPPUMAKERFLAGS += -C
diff --git a/cpputools/source/regsingleton/makefile.mk b/cpputools/source/regsingleton/makefile.mk
index 541a5b30e..be2c07d1c 100644
--- a/cpputools/source/regsingleton/makefile.mk
+++ b/cpputools/source/regsingleton/makefile.mk
@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 NO_OFFUH=TRUE
 CPPUMAKERFLAGS+= -C
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index f44667d34..3ecab8882 100644
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 NO_OFFUH=TRUE
 CPPUMAKERFLAGS+= -C
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index 955d89e5a..b537b2087 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -36,15 +36,15 @@ TARGET = acceptor.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = acceptor
-COMPRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
+COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 DLLPRE =
 # ------------------------------------------------------------------
 
-UNOUCRDEP=$(COMPRDB)
-UNOUCRRDB=$(COMPRDB)
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 UNOUCROUT=$(OUT)$/inc$/acceptor
 INCPRE+= $(UNOUCROUT)
 
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index 32b8e2287..d726ac4c8 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -36,15 +36,15 @@ TARGET = connector.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = connectr
-COMPRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
+COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 DLLPRE =
 # ------------------------------------------------------------------
 
-UNOUCRDEP=$(COMPRDB)
-UNOUCRRDB=$(COMPRDB)
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 UNOUCROUT=$(OUT)$/inc$/connector
 INCPRE+= $(UNOUCROUT)
 
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
index 0285fa75d..e4b8ad326 100644
--- a/io/source/stm/makefile.mk
+++ b/io/source/stm/makefile.mk
@@ -35,14 +35,14 @@ TARGET = streams.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = stm
-COMPRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
+COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 DLLPRE =
 # --- Files --------------------------------------------------------
-UNOUCRDEP=$(COMPRDB)
-UNOUCRRDB=$(COMPRDB)
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 UNOUCROUT=$(OUT)$/inc$/stm
 INCPRE+= $(UNOUCROUT)
 
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk
index a537a70ab..4898c6a11 100644
--- a/javaunohelper/source/makefile.mk
+++ b/javaunohelper/source/makefile.mk
@@ -48,8 +48,8 @@ nojava:
 
 # ------------------------------------------------------------------
 
-UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
 UNOUCROUT=$(OUT)$/inc$/comprehensive
 INCPRE+=$(OUT)$/inc$/comprehensive
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 359dd4989..ede720d44 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -1,4 +1,4 @@
-oa	offapi	:	udkapi idlc NULL
+oa	offapi	:	udkapi idlc solenv NULL
 oa	offapi									usr1	-	all	oa_mkout NULL
 oa	offapi\com\sun\star\script				nmake	-	all	oa_script oa_embed NULL
 oa	offapi\com\sun\star\script\browse	nmake	-	all	oa_sfbrowse NULL
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index fa939752b..6e4a41503 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -160,15 +160,15 @@ ALLTAR : $(UCR)$/types.db \
        $(REGISTRYCHECKFLAG) \
        $(UNOTYPE_STATISTICS)
 
-$(UCR)$/types.db : $(UCR)$/offapi.db $(BUILDSOLARBINDIR)$/udkapi.rdb
+$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
     -$(RM) $(REGISTRYCHECKFLAG)
     $(GNUCOPY) -f $(UCR)$/offapi.db $@
-    $(REGMERGE) $@ / $(BUILDSOLARBINDIR)$/udkapi.rdb
+    $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
 
-$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(BUILDSOLARBINDIR)$/udkapi_doc.rdb
+$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
     -$(RM) $(REGISTRYCHECKFLAG)
     $(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
-    $(REGMERGE) $@ / $(BUILDSOLARBINDIR)$/udkapi_doc.rdb
+    $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
 
 #JSC: The type library has changed, all temporary not checked types are removed
 #     and will be check from now on.
diff --git a/offuh/source/makefile.mk b/offuh/source/makefile.mk
index 5386c68af..e7e19fddd 100644
--- a/offuh/source/makefile.mk
+++ b/offuh/source/makefile.mk
@@ -39,9 +39,6 @@ TARGET=		offuh
 
 # ------------------------------------------------------------------
 
-# during the split build, the path to types.rdb might differ
-UNOUCRRDB=$(BUILDSOLARBINDIR)$/types.rdb
-
 $(MISC)$/$(TARGET).don : $(UNOUCRRDB)
     @@-$(RM) $@
     $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index 7c8412403..924491620 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,4 +1,4 @@
-bgpu	pyuno	:	stoc cpputools cppuhelper bridges PYTHON:python NULL
+bgpu	pyuno	:	stoc cpputools cppuhelper bridges tools PYTHON:python NULL
 pu	pyuno				  usr1	-	all	br_mkout NULL
 pu	pyuno\zipcore	nmake	-	all	pu_zipcore NULL
 pu	pyuno\source\module	nmake	-	all	pu_module NULL
diff --git a/remotebridges/source/bridge/makefile.mk b/remotebridges/source/bridge/makefile.mk
index 38a721192..ef02b1bce 100644
--- a/remotebridges/source/bridge/makefile.mk
+++ b/remotebridges/source/bridge/makefile.mk
@@ -35,7 +35,6 @@ PRJNAME=remotebridges
 TARGET = remotebridge.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = remotebridge
-UNOUCRRDB = $(BUILDSOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
diff --git a/remotebridges/source/dynamicloader/makefile.mk b/remotebridges/source/dynamicloader/makefile.mk
index 7b6432b8c..1a4364c74 100755
--- a/remotebridges/source/dynamicloader/makefile.mk
+++ b/remotebridges/source/dynamicloader/makefile.mk
@@ -35,7 +35,6 @@ PRJNAME=remotebridges
 TARGET = dynamicloader.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = dynamicloader
-UNOUCRRDB = $(BUILDSOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk
index d8b3b61f2..280ed3882 100644
--- a/remotebridges/source/factory/makefile.mk
+++ b/remotebridges/source/factory/makefile.mk
@@ -35,7 +35,6 @@ PRJNAME=remotebridges
 TARGET = bridgefac.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = brdgfctr
-UNOUCRRDB = $(BUILDSOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk
index a2ff07008..bb005dc16 100644
--- a/remotebridges/source/unourl_resolver/makefile.mk
+++ b/remotebridges/source/unourl_resolver/makefile.mk
@@ -34,7 +34,6 @@ PRJNAME=remotebridges
 TARGET = uuresolver.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = uuresolver
-UNOUCRRDB = $(BUILDSOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
diff --git a/ridljar/javamaker/makefile.mk b/ridljar/javamaker/makefile.mk
index 8c0b70443..af254bc92 100644
--- a/ridljar/javamaker/makefile.mk
+++ b/ridljar/javamaker/makefile.mk
@@ -35,7 +35,7 @@ TARGET := javamaker
 
 .INCLUDE: settings.mk
 
-RDB = $(BUILDSOLARBINDIR)$/udkapi.rdb
+RDB = $(SOLARBINDIR)$/udkapi.rdb
 
 .INCLUDE: target.mk
 
diff --git a/ridljar/prj/build.lst b/ridljar/prj/build.lst
index a43b9fbb5..ac91c68bd 100644
--- a/ridljar/prj/build.lst
+++ b/ridljar/prj/build.lst
@@ -1,4 +1,4 @@
-ri ridljar : codemaker udkapi NULL
+ri ridljar : codemaker solenv udkapi NULL
 ri ridljar\javamaker nmake - all javamaker NULL
 ri ridljar\com nmake - all com javamaker NULL
 ri ridljar\util nmake - all util javamaker com NULL
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 48501626b..5622d80ed 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,4 +1,4 @@
-sa	sal	:	xml2cmp BOOST:boost NULL 
+sa	sal	:	xml2cmp stlport external BOOST:boost NULL 
 sa	sal										usr1	-	all	sa_mkout NULL
 sa	sal\inc									nmake	-	all	sa_inc NULL
 sa	sal\typesconfig							nmake	-	u	sa_tc sa_inc NULL
diff --git a/stoc/source/cppumaker.mk b/stoc/source/cppumaker.mk
index 933ce70cc..39a5155c4 100644
--- a/stoc/source/cppumaker.mk
+++ b/stoc/source/cppumaker.mk
@@ -43,4 +43,3 @@ CFLAGS += -Ob0
 
 .ENDIF
 
-UNOUCRRDB=$(BUILDSOLARBINDIR)$/types.rdb
diff --git a/unoil/javamaker/makefile.mk b/unoil/javamaker/makefile.mk
index b2c9811fa..3a50e8b7a 100644
--- a/unoil/javamaker/makefile.mk
+++ b/unoil/javamaker/makefile.mk
@@ -35,8 +35,8 @@ TARGET := javamaker
 
 .INCLUDE: settings.mk
 
-RDB = $(BUILDSOLARBINDIR)$/offapi.rdb
-EXTRA_RDB = $(BUILDSOLARBINDIR)$/udkapi.rdb
+RDB = $(SOLARBINDIR)$/offapi.rdb
+EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
 
 .INCLUDE: target.mk
 
diff --git a/unoil/prj/build.lst b/unoil/prj/build.lst
index 6c91fe4d0..c229639c7 100644
--- a/unoil/prj/build.lst
+++ b/unoil/prj/build.lst
@@ -1,4 +1,4 @@
-ul unoil :: codemaker offapi ridljar cli_ure NULL
+ul unoil :: codemaker offapi ridljar solenv cli_ure NULL
 ul unoil\javamaker nmake - all ul_javamaker NULL
 ul unoil\util nmake - all ul_util ul_javamaker NULL
-ul unoil\climaker nmake - all  ul_climaker NULL
+ul unoil\climaker nmake - all  ul_climaker NULL
\ No newline at end of file
diff --git a/ure/prj/build.lst b/ure/prj/build.lst
index fa6a458f2..07fbfc484 100644
--- a/ure/prj/build.lst
+++ b/ure/prj/build.lst
@@ -1,2 +1,2 @@
-ur ure : cli_ure NULL
+ur ure : cli_ure solenv NULL
 ur ure\source nmake - all ur_source NULL
diff --git a/xml2cmp/prj/build.lst b/xml2cmp/prj/build.lst
index 70c4a45a6..e9f2979af 100644
--- a/xml2cmp/prj/build.lst
+++ b/xml2cmp/prj/build.lst
@@ -1,4 +1,4 @@
-xc  xml2cmp : NULL
+xc  xml2cmp : soltools stlport NULL
 xc  xml2cmp                         usr1    -	all	xc_mkout NULL
 xc  xml2cmp\prj                     get -	all	xc_prj NULL
 xc  xml2cmp\source\support                  nmake   -   all	xc_supp NULL