Merge branch 'master' into feature/gnumake4

Conflicts:
	Repository.mk
	RepositoryFixes.mk
	configure
	configure.in
	set_soenv.in
	solenv/config/sdev300.ini
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/CustomTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/StaticLibrary.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/platform/winmingw.mk
	solenv/gbuild/templates/Executable.mk
	solenv/gbuild/templates/Library.mk
	solenv/inc/libs.mk
	solenv/inc/unxobsd.mk

5 files changed, 104 insertions, 0 deletions

diff --git a/tail_build/Makefile b/tail_build/Makefile
new file mode 100644
index 000000000000..4773523fe957
--- /dev/null
+++ b/tail_build/Makefile
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# 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 ./source_soenv.sh; then . ./source_soenv.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
new file mode 100644
index 000000000000..4e29fb139ffb
--- /dev/null
+++ b/tail_build/README
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000000..65eda027916d
--- /dev/null
+++ b/tail_build/prj/build.lst
@@ -0,0 +1,2 @@
+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 offapi offuh oovbaapi oox package qadevOOo 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
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tail_build/prj/d.lst
diff --git a/tail_build/prj/makefile.mk b/tail_build/prj/makefile.mk
new file mode 100644
index 000000000000..e312a7ccab65
--- /dev/null
+++ b/tail_build/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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