[Libreoffice-commits] .: 5 commits - animations/Makefile automation/Makefile avmedia/Makefile basctl/Makefile basebmp/Makefile basegfx/Makefile basic/Makefile bean/Makefile binaryurp/Makefile canvas/Makefile chart2/Makefile comphelper/Makefile configmgr/Makefile configure.in cppcanvas/Makefile cui/Makefile dbaccess/Makefile desktop/Makefile drawinglayer/Makefile dtrans/Makefile editeng/Makefile eventattacher/Makefile extensions/Makefile fileaccess/Makefile filter/Makefile forms/Makefile formula/Makefile framework/Makefile .gitignore GNUmakefile.mk hwpfilter/Makefile i18npool/Makefile i18nutil/Makefile idl/Makefile libcmis/Makefile linguistic/Makefile lotuswordpro/Makefile Makefile Makefile.in MathMLDTD/Makefile Mesa/Makefile nlpsolver/Makefile o3tl/Makefile offapi/Makefile officecfg/Makefile oovbaapi/Makefile oox/Makefile package/Makefile padmin/Makefile psprint_config/Makefile qadevOOo/Makefile regexp/Makefile reportdesign/Makefile rsc/Makefile sal/Makefile sane/Makefile sax/Makefile sca ddins/Makefile sccomp/Makefile sc/Makefile scripting/Makefile sd/Makefile sd/Module_sd.mk set_soenv.in sfx2/Makefile slideshow/Makefile solenv/gbuild sot/Makefile starmath/Makefile svl/Makefile svtools/Makefile svx/Makefile swext/Makefile sw/Makefile tail_build/Makefile testautomation/Makefile toolkit/Makefile tools/Makefile twain/Makefile ucbhelper/Makefile ucb/Makefile udkapi/Makefile unixODBC/Makefile unotools/Makefile unoxml/Makefile uui/Makefile vbahelper/Makefile vcl/Makefile wizards/Makefile writerfilter/Makefile writerperfect/Makefile xmerge/Makefile xml2cmp/Makefile xmloff/Makefile xmlreader/Makefile xmlscript/Makefile xmlsecurity/Makefile
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Tue Nov 29 08:25:31 PST 2011
.gitignore | 1
GNUmakefile.mk | 38 --------
Makefile | 48 ++++++++++
Makefile.in | 105 ------------------------
MathMLDTD/Makefile | 2
Mesa/Makefile | 2
animations/Makefile | 2
automation/Makefile | 2
avmedia/Makefile | 2
basctl/Makefile | 2
basebmp/Makefile | 2
basegfx/Makefile | 2
basic/Makefile | 2
bean/Makefile | 2
binaryurp/Makefile | 2
canvas/Makefile | 2
chart2/Makefile | 2
comphelper/Makefile | 2
configmgr/Makefile | 2
configure.in | 2
cppcanvas/Makefile | 2
cui/Makefile | 2
dbaccess/Makefile | 2
desktop/Makefile | 2
drawinglayer/Makefile | 2
dtrans/Makefile | 2
editeng/Makefile | 2
eventattacher/Makefile | 2
extensions/Makefile | 2
fileaccess/Makefile | 2
filter/Makefile | 2
forms/Makefile | 2
formula/Makefile | 2
framework/Makefile | 2
hwpfilter/Makefile | 2
i18npool/Makefile | 2
i18nutil/Makefile | 2
idl/Makefile | 2
libcmis/Makefile | 2
linguistic/Makefile | 2
lotuswordpro/Makefile | 2
nlpsolver/Makefile | 2
o3tl/Makefile | 2
offapi/Makefile | 2
officecfg/Makefile | 2
oovbaapi/Makefile | 2
oox/Makefile | 2
package/Makefile | 2
padmin/Makefile | 2
psprint_config/Makefile | 2
qadevOOo/Makefile | 2
regexp/Makefile | 2
reportdesign/Makefile | 2
rsc/Makefile | 2
sal/Makefile | 2
sane/Makefile | 2
sax/Makefile | 2
sc/Makefile | 2
scaddins/Makefile | 2
sccomp/Makefile | 2
scripting/Makefile | 2
sd/Makefile | 2
sd/Module_sd.mk | 4
set_soenv.in | 2
sfx2/Makefile | 2
slideshow/Makefile | 2
solenv/gbuild/BuildDirs.mk | 6 -
solenv/gbuild/extensions/post_AuxTargets.mk | 13 ++
solenv/gbuild/extensions/post_BuildplTargets.mk | 23 +++++
solenv/gbuild/extensions/post_SpeedUpTargets.mk | 2
solenv/gbuild/gbuild.mk | 4
solenv/gbuild/source_and_rerun.mk | 23 ++++-
sot/Makefile | 2
starmath/Makefile | 2
svl/Makefile | 2
svtools/Makefile | 2
svx/Makefile | 2
sw/Makefile | 2
swext/Makefile | 2
tail_build/Makefile | 3
testautomation/Makefile | 2
toolkit/Makefile | 2
tools/Makefile | 2
twain/Makefile | 2
ucb/Makefile | 2
ucbhelper/Makefile | 2
udkapi/Makefile | 2
unixODBC/Makefile | 2
unotools/Makefile | 2
unoxml/Makefile | 2
uui/Makefile | 2
vbahelper/Makefile | 2
vcl/Makefile | 2
wizards/Makefile | 2
writerfilter/Makefile | 2
writerperfect/Makefile | 2
xmerge/Makefile | 2
xml2cmp/Makefile | 2
xmloff/Makefile | 2
xmlreader/Makefile | 2
xmlscript/Makefile | 2
xmlsecurity/Makefile | 2
102 files changed, 201 insertions(+), 249 deletions(-)
New commits:
commit f275b22a2013a4949ec3b137b8d5339471eba904
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Nov 29 17:18:38 2011 +0100
disable sd filters test for now
- it seems to have incomplete dependencies
- it hangs the tinderboxes on a build from scratch
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 796deb5..4fd3a95 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -43,8 +43,10 @@ $(eval $(call gb_Module_add_targets,sd,\
ifneq ($(OS),DRAGONFLY)
$(eval $(call gb_Module_add_check_targets,sd,\
CppunitTest_sd_uimpress \
- CppunitTest_sd_filters_test \
))
+# disabled for now, seems to have incomplete deps and hangs on a build from scratch
+# CppunitTest_sd_filters_test \
+
endif
commit 80f27b43e1df90fa9d5d37774a5870388ccdf3e8
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Nov 29 17:11:34 2011 +0100
Makefile.in -- die, die, die!
diff --git a/.gitignore b/.gitignore
index a7f5466..caf15fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,7 +53,6 @@
/config.parms
/configure
/desktop/scripts/soffice.sh
-/Makefile
/makefile.mk
/set_soenv
/post_download
diff --git a/GNUmakefile.mk b/GNUmakefile.mk
deleted file mode 100644
index d40695c..0000000
--- a/GNUmakefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- Mode: makefile-gmake; 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.
-#
-#*************************************************************************
-
-gb_SOURCEANDRERUN:=
-SRCDIR:=$(realpath $(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
-ifeq ($(strip $(SOLARENV)),)
-ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
-gb_SOURCEANDRERUN:=T
-gb_MINISOLARENV:=
-else
-SOLARENV:=$(SRCDIR)/solenv
-gb_MINISOLARENV:=T
-endif
-endif
-
-ifneq ($(gb_SOURCEANDRERUN),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk
-else
-include $(SOLARENV)/gbuild/gbuild.mk
-$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..d40695c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; 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.
+#
+#*************************************************************************
+
+gb_SOURCEANDRERUN:=
+SRCDIR:=$(realpath $(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
+ifeq ($(strip $(SOLARENV)),)
+ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
+gb_SOURCEANDRERUN:=T
+gb_MINISOLARENV:=
+else
+SOLARENV:=$(SRCDIR)/solenv
+gb_MINISOLARENV:=T
+endif
+endif
+
+ifneq ($(gb_SOURCEANDRERUN),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk
+else
+include $(SOLARENV)/gbuild/gbuild.mk
+$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index b02ea16..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-# @configure_input@
-
-SHELL=/usr/bin/env bash
-
-.PHONY : build dev-install all cross_toolset install distro-pack-install clean clean-host clean-build distclean findunusedcode bootstrap
-
-define forward_to_gbuild
- at GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk \
- $(if @VERBOSE@,,-s) \
- $(1)
-endef
-
-all:
- @$(call forward_to_gbuild,$@)
-
-check:
- @$(call forward_to_gbuild,$@)
-
-bootstrap:
- @$(call forward_to_gbuild,$@)
-
-debugrun:
- @$(call forward_to_gbuild,$@)
-
-%check:
- @$(call forward_to_gbuild,$@)
-
-distro-pack-install: install
- @$(call forward_to_gbuild,$@)
-
-id:
- @$(call forward_to_gbuild,$@)
-
-tags:
- @$(call forward_to_gbuild,$@)
-
-docs:
- @$(call forward_to_gbuild,$@)
-
-build: Makefile
- @$(call forward_to_gbuild,$@)
-
-dev-install: Makefile
- @$(call forward_to_gbuild,$@)
-
-cross_toolset:
- @$(call forward_to_gbuild,$@)
-
-clean:
- @$(call forward_to_gbuild,$@)
-
-clean-host:
- @$(call forward_to_gbuild,$@)
-
-clean-build:
- @$(call forward_to_gbuild,$@)
-
-distclean:
- @$(call forward_to_gbuild,$@)
-
-fetch:
- @$(call forward_to_gbuild,$@)
-
-unitcheck:
- @$(call forward_to_gbuild,$@)
-
-install:
- @$(call forward_to_gbuild,$@)
-
-findunusedcode:
- @$(call forward_to_gbuild,$@)
-
-ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
-Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
- ./autogen.sh
-endif
-
-#as long as we are not completely gbuildified we need to explicitly depend on the build/install
-#debugrun : dev-install # disabled for now, this dep seems to poison the debugrun !?
diff --git a/configure.in b/configure.in
index 005a68e..b9b3577 100644
--- a/configure.in
+++ b/configure.in
@@ -9721,7 +9721,7 @@ else
echo > set_soenv.last
fi
-AC_CONFIG_FILES([ooo.lst set_soenv Makefile bin/repo-list desktop/scripts/soffice.sh build_env])
+AC_CONFIG_FILES([ooo.lst set_soenv bin/repo-list desktop/scripts/soffice.sh build_env])
AC_OUTPUT
# make sure this is executable
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index 22aa4ed..a08d46e 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -49,7 +49,7 @@ $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
fetch: $(SRCDIR)/src.downloaded
# fixme: can we prevent these exports in the first place?
-$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
+$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
$(if $(gb_MINISOLARENV),unset GBUILDDIR gb_Helper_execute gb_XSLTPROC gb_Helper_set_ld_path gb_AWK DBGSV_ERROR_OUT && $(SRCDIR)/autogen.sh, at echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
$(WORKDIR)/bootstrap:
commit d73e574d8abd933537bf4d2155f36aa9a91a0acc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Nov 29 17:07:57 2011 +0100
move reconfigure into gbuild
diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index 6d613a6..d40695c 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -26,13 +26,23 @@
#
#*************************************************************************
+gb_SOURCEANDRERUN:=
+SRCDIR:=$(realpath $(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
ifeq ($(strip $(SOLARENV)),)
+ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
+gb_SOURCEANDRERUN:=T
+gb_MINISOLARENV:=
+else
+SOLARENV:=$(SRCDIR)/solenv
+gb_MINISOLARENV:=T
+endif
+endif
+
+ifneq ($(gb_SOURCEANDRERUN),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk
else
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
endif
-
-
# vim: set noet sw=4 ts=4:
diff --git a/MathMLDTD/Makefile b/MathMLDTD/Makefile
index f9ac01e..7b3dec8 100644
--- a/MathMLDTD/Makefile
+++ b/MathMLDTD/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/Mesa/Makefile b/Mesa/Makefile
index f9ac01e..7b3dec8 100644
--- a/Mesa/Makefile
+++ b/Mesa/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/animations/Makefile b/animations/Makefile
index f9ac01e..7b3dec8 100644
--- a/animations/Makefile
+++ b/animations/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/automation/Makefile b/automation/Makefile
index f9ac01e..7b3dec8 100644
--- a/automation/Makefile
+++ b/automation/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/avmedia/Makefile b/avmedia/Makefile
index f9ac01e..7b3dec8 100644
--- a/avmedia/Makefile
+++ b/avmedia/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/basctl/Makefile b/basctl/Makefile
index f9ac01e..7b3dec8 100644
--- a/basctl/Makefile
+++ b/basctl/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/basebmp/Makefile b/basebmp/Makefile
index f9ac01e..7b3dec8 100644
--- a/basebmp/Makefile
+++ b/basebmp/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/basegfx/Makefile b/basegfx/Makefile
index f9ac01e..7b3dec8 100644
--- a/basegfx/Makefile
+++ b/basegfx/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/basic/Makefile b/basic/Makefile
index f9ac01e..7b3dec8 100644
--- a/basic/Makefile
+++ b/basic/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/bean/Makefile b/bean/Makefile
index f9ac01e..7b3dec8 100644
--- a/bean/Makefile
+++ b/bean/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/binaryurp/Makefile b/binaryurp/Makefile
index f9ac01e..7b3dec8 100644
--- a/binaryurp/Makefile
+++ b/binaryurp/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/canvas/Makefile b/canvas/Makefile
index f9ac01e..7b3dec8 100644
--- a/canvas/Makefile
+++ b/canvas/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/chart2/Makefile b/chart2/Makefile
index f9ac01e..7b3dec8 100644
--- a/chart2/Makefile
+++ b/chart2/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/comphelper/Makefile b/comphelper/Makefile
index f9ac01e..7b3dec8 100644
--- a/comphelper/Makefile
+++ b/comphelper/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/configmgr/Makefile b/configmgr/Makefile
index f9ac01e..7b3dec8 100644
--- a/configmgr/Makefile
+++ b/configmgr/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/cppcanvas/Makefile b/cppcanvas/Makefile
index f9ac01e..7b3dec8 100644
--- a/cppcanvas/Makefile
+++ b/cppcanvas/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/cui/Makefile b/cui/Makefile
index f9ac01e..7b3dec8 100644
--- a/cui/Makefile
+++ b/cui/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/dbaccess/Makefile b/dbaccess/Makefile
index f9ac01e..7b3dec8 100644
--- a/dbaccess/Makefile
+++ b/dbaccess/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/desktop/Makefile b/desktop/Makefile
index f9ac01e..7b3dec8 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/drawinglayer/Makefile b/drawinglayer/Makefile
index f9ac01e..7b3dec8 100644
--- a/drawinglayer/Makefile
+++ b/drawinglayer/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/dtrans/Makefile b/dtrans/Makefile
index f9ac01e..7b3dec8 100644
--- a/dtrans/Makefile
+++ b/dtrans/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/editeng/Makefile b/editeng/Makefile
index f9ac01e..7b3dec8 100644
--- a/editeng/Makefile
+++ b/editeng/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/eventattacher/Makefile b/eventattacher/Makefile
index f9ac01e..7b3dec8 100644
--- a/eventattacher/Makefile
+++ b/eventattacher/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/extensions/Makefile b/extensions/Makefile
index f9ac01e..7b3dec8 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/fileaccess/Makefile b/fileaccess/Makefile
index f9ac01e..7b3dec8 100644
--- a/fileaccess/Makefile
+++ b/fileaccess/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/filter/Makefile b/filter/Makefile
index f9ac01e..7b3dec8 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/forms/Makefile b/forms/Makefile
index f9ac01e..7b3dec8 100644
--- a/forms/Makefile
+++ b/forms/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/formula/Makefile b/formula/Makefile
index f9ac01e..7b3dec8 100644
--- a/formula/Makefile
+++ b/formula/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/framework/Makefile b/framework/Makefile
index f9ac01e..7b3dec8 100644
--- a/framework/Makefile
+++ b/framework/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/hwpfilter/Makefile b/hwpfilter/Makefile
index f9ac01e..7b3dec8 100644
--- a/hwpfilter/Makefile
+++ b/hwpfilter/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/i18npool/Makefile b/i18npool/Makefile
index f9ac01e..7b3dec8 100644
--- a/i18npool/Makefile
+++ b/i18npool/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/i18nutil/Makefile b/i18nutil/Makefile
index f9ac01e..7b3dec8 100644
--- a/i18nutil/Makefile
+++ b/i18nutil/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/idl/Makefile b/idl/Makefile
index f9ac01e..7b3dec8 100644
--- a/idl/Makefile
+++ b/idl/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/libcmis/Makefile b/libcmis/Makefile
index f9ac01e..7b3dec8 100644
--- a/libcmis/Makefile
+++ b/libcmis/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/linguistic/Makefile b/linguistic/Makefile
index f9ac01e..7b3dec8 100644
--- a/linguistic/Makefile
+++ b/linguistic/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/lotuswordpro/Makefile b/lotuswordpro/Makefile
index f9ac01e..7b3dec8 100644
--- a/lotuswordpro/Makefile
+++ b/lotuswordpro/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/nlpsolver/Makefile b/nlpsolver/Makefile
index f9ac01e..7b3dec8 100644
--- a/nlpsolver/Makefile
+++ b/nlpsolver/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/o3tl/Makefile b/o3tl/Makefile
index f9ac01e..7b3dec8 100644
--- a/o3tl/Makefile
+++ b/o3tl/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/offapi/Makefile b/offapi/Makefile
index f9ac01e..7b3dec8 100644
--- a/offapi/Makefile
+++ b/offapi/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/officecfg/Makefile b/officecfg/Makefile
index f9ac01e..7b3dec8 100644
--- a/officecfg/Makefile
+++ b/officecfg/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile
index f9ac01e..7b3dec8 100644
--- a/oovbaapi/Makefile
+++ b/oovbaapi/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/oox/Makefile b/oox/Makefile
index f9ac01e..7b3dec8 100644
--- a/oox/Makefile
+++ b/oox/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/package/Makefile b/package/Makefile
index f9ac01e..7b3dec8 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/padmin/Makefile b/padmin/Makefile
index f9ac01e..7b3dec8 100644
--- a/padmin/Makefile
+++ b/padmin/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/psprint_config/Makefile b/psprint_config/Makefile
index f9ac01e..7b3dec8 100644
--- a/psprint_config/Makefile
+++ b/psprint_config/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/qadevOOo/Makefile b/qadevOOo/Makefile
index f9ac01e..7b3dec8 100644
--- a/qadevOOo/Makefile
+++ b/qadevOOo/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/regexp/Makefile b/regexp/Makefile
index f9ac01e..7b3dec8 100644
--- a/regexp/Makefile
+++ b/regexp/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/reportdesign/Makefile b/reportdesign/Makefile
index f9ac01e..7b3dec8 100644
--- a/reportdesign/Makefile
+++ b/reportdesign/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/rsc/Makefile b/rsc/Makefile
index f9ac01e..7b3dec8 100644
--- a/rsc/Makefile
+++ b/rsc/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/sal/Makefile b/sal/Makefile
index f9ac01e..7b3dec8 100644
--- a/sal/Makefile
+++ b/sal/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/sane/Makefile b/sane/Makefile
index f9ac01e..7b3dec8 100644
--- a/sane/Makefile
+++ b/sane/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/sax/Makefile b/sax/Makefile
index f9ac01e..7b3dec8 100644
--- a/sax/Makefile
+++ b/sax/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/sc/Makefile b/sc/Makefile
index f9ac01e..7b3dec8 100644
--- a/sc/Makefile
+++ b/sc/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/scaddins/Makefile b/scaddins/Makefile
index f9ac01e..7b3dec8 100644
--- a/scaddins/Makefile
+++ b/scaddins/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/sccomp/Makefile b/sccomp/Makefile
index f9ac01e..7b3dec8 100644
--- a/sccomp/Makefile
+++ b/sccomp/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/scripting/Makefile b/scripting/Makefile
index f9ac01e..7b3dec8 100644
--- a/scripting/Makefile
+++ b/scripting/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/sd/Makefile b/sd/Makefile
index f9ac01e..7b3dec8 100644
--- a/sd/Makefile
+++ b/sd/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/set_soenv.in b/set_soenv.in
index b399531..4070684 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2042,7 +2042,7 @@ if ($platform !~ m/cygwin/) {
}
}
ToFile( "SOLARSRC", $SOLARSRC, "e" );
-ToFile( "gb_REPOS", $gb_REPOS, "e" );
+ToFile( "SRCDIR", $SOLARSRC, "e" );
if ( $platform =~ m/cygwin/ )
{
diff --git a/sfx2/Makefile b/sfx2/Makefile
index f9ac01e..7b3dec8 100644
--- a/sfx2/Makefile
+++ b/sfx2/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/slideshow/Makefile b/slideshow/Makefile
index f9ac01e..7b3dec8 100644
--- a/slideshow/Makefile
+++ b/slideshow/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 9802a61..6a0933b 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -31,12 +31,10 @@ SOLARINC += $(JDKINCS)
OUTDIR := $(SOLARVERSION)/$(INPATH)
OUTDIR_FOR_BUILD := $(SOLARVERSION)/$(INPATH_FOR_BUILD)
-ifeq ($(strip $(WORKDIR)),)
-$(error WORKDIR variable is empty, no environment set, aborting)
+ifeq ($(strip $(SOLARENV)),)
+$(error SOLARENV variable is empty, no environment set, aborting)
endif
-SRCDIR := $(SOLARSRC)
-
# HACK
# unixify windoze paths
ifeq ($(OS_FOR_BUILD),WNT)
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index c137fb0..22aa4ed 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -48,6 +48,10 @@ $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
fetch: $(SRCDIR)/src.downloaded
+# fixme: can we prevent these exports in the first place?
+$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
+ $(if $(gb_MINISOLARENV),unset GBUILDDIR gb_Helper_execute gb_XSLTPROC gb_Helper_set_ld_path gb_AWK DBGSV_ERROR_OUT && $(SRCDIR)/autogen.sh, at echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
+
$(WORKDIR)/bootstrap:
@cd $(SRCDIR) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 7e1a640..842f05e 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -28,7 +28,7 @@
# speed up if no target need to parse all modules
ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun,$(MAKECMDGOALS)),)
+ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun Env.Host.sh,$(MAKECMDGOALS)),)
gb_Module_add_target=
gb_Module_add_check_target=
gb_Module_add_subsequentcheck_target=
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c3d1308..57387f1 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-GBUILDDIR:=$(SRC_ROOT)/solenv/gbuild
+GBUILDDIR:=$(SRCDIR)/solenv/gbuild
# vars needed from the env/calling makefile
@@ -151,7 +151,9 @@ $(eval $(call gb_Helper_collect_libtargets))
gb_Library_DLLPOSTFIX := lo
# Include platform/cpu/compiler specific config/definitions
+ifneq ($(strip $(OS)),)
include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
+endif
ifeq ($(CROSS_COMPILING),YES)
# We can safely Assume all cross-compilation is from Unix systems.
diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk
index 418acc5..1fe62c8 100644
--- a/solenv/gbuild/source_and_rerun.mk
+++ b/solenv/gbuild/source_and_rerun.mk
@@ -1,13 +1,28 @@
gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+$(info gb_PARTIALBUILD $(gb_PARTIALBUILD))
+ifneq ($(strip $(gb_PARTIALBUILD)),)
+
+SRCDIR:=$(realpath $(gb_MAKEFILEDIR)/..)
+gb_SourceEnvAndRecurse_reconfigure=true
+
+else
+
+SRCDIR:=$(realpath $(gb_MAKEFILEDIR))
+gb_SourceEnvAndRecurse_reconfigure=$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(SRCDIR)/Env.Host.sh
+
+endif
+
source-env-and-recurse:
- @if test -f $(gb_MAKEFILEDIR)/config.mk; then . $(gb_MAKEFILEDIR)/config.mk; else if test -f $(gb_MAKEFILEDIR)/../config.mk ; then . $(gb_MAKEFILEDIR)/../config.mk; fi; fi && \
- if test -f $(gb_MAKEFILEDIR)/Env.Host.sh; then . $(gb_MAKEFILEDIR)/Env.Host.sh; else if test -f $(gb_MAKEFILEDIR)/../Env.Host.sh; then . $(gb_MAKEFILEDIR)/../Env.Host.sh; fi ; fi && \
- if test -z "$${SOLARENV}"; then echo "No environment set!" 2>&1; exit 1; fi && \
+ $(gb_SourceEnvAndRecurse_reconfigure) && \
+ if test -f $(SRCDIR)/config.mk ; then . $(SRCDIR)/config.mk; fi && \
+ if test -f $(SRCDIR)/Env.Host.sh; then . $(SRCDIR)/Env.Host.sh; fi && \
+ if test -z "$${SOLARENV}"; then echo "no configuration found and could not create one" && exit 1; fi && \
$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(MAKECMDGOALS)
ifneq ($(strip $(MAKECMDGOALS)),)
+ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
$(eval $(MAKECMDGOALS) : source-env-and-recurse)
endif
-
+endif
diff --git a/sot/Makefile b/sot/Makefile
index f9ac01e..7b3dec8 100644
--- a/sot/Makefile
+++ b/sot/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/starmath/Makefile b/starmath/Makefile
index f9ac01e..7b3dec8 100644
--- a/starmath/Makefile
+++ b/starmath/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/svl/Makefile b/svl/Makefile
index f9ac01e..7b3dec8 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/svtools/Makefile b/svtools/Makefile
index f9ac01e..7b3dec8 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/svx/Makefile b/svx/Makefile
index f9ac01e..7b3dec8 100644
--- a/svx/Makefile
+++ b/svx/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/sw/Makefile b/sw/Makefile
index f9ac01e..7b3dec8 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/swext/Makefile b/swext/Makefile
index f9ac01e..7b3dec8 100644
--- a/swext/Makefile
+++ b/swext/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/tail_build/Makefile b/tail_build/Makefile
index 59fd1c7..e13530e 100644
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@@ -26,12 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD=T
-
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))
diff --git a/testautomation/Makefile b/testautomation/Makefile
index f9ac01e..7b3dec8 100644
--- a/testautomation/Makefile
+++ b/testautomation/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/toolkit/Makefile b/toolkit/Makefile
index f9ac01e..7b3dec8 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/tools/Makefile b/tools/Makefile
index f9ac01e..7b3dec8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/twain/Makefile b/twain/Makefile
index f9ac01e..7b3dec8 100644
--- a/twain/Makefile
+++ b/twain/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/ucb/Makefile b/ucb/Makefile
index f9ac01e..7b3dec8 100644
--- a/ucb/Makefile
+++ b/ucb/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/ucbhelper/Makefile b/ucbhelper/Makefile
index f9ac01e..7b3dec8 100644
--- a/ucbhelper/Makefile
+++ b/ucbhelper/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/udkapi/Makefile b/udkapi/Makefile
index f9ac01e..7b3dec8 100644
--- a/udkapi/Makefile
+++ b/udkapi/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/unixODBC/Makefile b/unixODBC/Makefile
index f9ac01e..7b3dec8 100644
--- a/unixODBC/Makefile
+++ b/unixODBC/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/unotools/Makefile b/unotools/Makefile
index f9ac01e..7b3dec8 100644
--- a/unotools/Makefile
+++ b/unotools/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/unoxml/Makefile b/unoxml/Makefile
index f9ac01e..7b3dec8 100644
--- a/unoxml/Makefile
+++ b/unoxml/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/uui/Makefile b/uui/Makefile
index f9ac01e..7b3dec8 100644
--- a/uui/Makefile
+++ b/uui/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/vbahelper/Makefile b/vbahelper/Makefile
index f9ac01e..7b3dec8 100644
--- a/vbahelper/Makefile
+++ b/vbahelper/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/vcl/Makefile b/vcl/Makefile
index f9ac01e..7b3dec8 100644
--- a/vcl/Makefile
+++ b/vcl/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/wizards/Makefile b/wizards/Makefile
index f9ac01e..7b3dec8 100644
--- a/wizards/Makefile
+++ b/wizards/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/writerfilter/Makefile b/writerfilter/Makefile
index f9ac01e..7b3dec8 100644
--- a/writerfilter/Makefile
+++ b/writerfilter/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/writerperfect/Makefile b/writerperfect/Makefile
index f9ac01e..7b3dec8 100644
--- a/writerperfect/Makefile
+++ b/writerperfect/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/xmerge/Makefile b/xmerge/Makefile
index f9ac01e..7b3dec8 100644
--- a/xmerge/Makefile
+++ b/xmerge/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/xml2cmp/Makefile b/xml2cmp/Makefile
index f9ac01e..7b3dec8 100644
--- a/xml2cmp/Makefile
+++ b/xml2cmp/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/xmloff/Makefile b/xmloff/Makefile
index f9ac01e..7b3dec8 100644
--- a/xmloff/Makefile
+++ b/xmloff/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/xmlreader/Makefile b/xmlreader/Makefile
index f9ac01e..7b3dec8 100644
--- a/xmlreader/Makefile
+++ b/xmlreader/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/xmlscript/Makefile b/xmlscript/Makefile
index f9ac01e..7b3dec8 100644
--- a/xmlscript/Makefile
+++ b/xmlscript/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
diff --git a/xmlsecurity/Makefile b/xmlsecurity/Makefile
index f9ac01e..7b3dec8 100644
--- a/xmlsecurity/Makefile
+++ b/xmlsecurity/Makefile
@@ -26,11 +26,11 @@
#
#*************************************************************************
+gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
-gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
commit 6a6152a9a3d76f8ce26e4a9b5bd6479f31009ee7
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Nov 29 14:24:54 2011 +0100
moved findunusedcode to gbuild
diff --git a/Makefile.in b/Makefile.in
index 2a1407e..b02ea16 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,34 +67,13 @@ unitcheck:
install:
@$(call forward_to_gbuild,$@)
+findunusedcode:
+ @$(call forward_to_gbuild,$@)
+
ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
./autogen.sh
endif
-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 && \
- mkdir -p $$SRC_ROOT/solenv/callcatcher/bin && \
- ln -sf $$SRC_ROOT/solenv/$$INPATH/bin/dmake \
- $$SRC_ROOT/solenv/callcatcher/bin/dmake && \
- source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
- . ./solenv/bin/callcatchEnv.Set.sh && \
- cd instsetoo_native && \
- build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
- @. ./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:: > unusedcode.easy
-
#as long as we are not completely gbuildified we need to explicitly depend on the build/install
#debugrun : dev-install # disabled for now, this dep seems to poison the debugrun !?
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 592f590..306d0ad 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -58,7 +58,7 @@ cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS
$(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
endef
-.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
+.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build findunusedcode
smoketestoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | instsetoo_native
$(call gb_BuildplTarget_command,$@,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from instsetoo_native,--all))
@@ -70,6 +70,27 @@ instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(
cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@,--all)
+# experimental callcatcher target
+# http://www.skynet.ie/~caolan/Packages/callcatcher.html
+findunusedcode:
+ @which callcatcher > /dev/null 2>&1 || \
+ (echo "callcatcher not installed" && false)
+ @mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
+ ln -sf $(SRCDIR)/solenv/$(INPATH)/bin/dmake \
+ $(SRCDIR)/solenv/callcatcher/bin/dmake && \
+ source <(sed -e s,$(INPATH),callcatcher,g $(SRCDIR)/Env.Host.sh) && \
+ source $(SRCDIR)/solenv/bin/callcatchEnv.Set.sh && \
+ $(call gb_BuildplTarget_command,instsetoo_native,--all)
+ @source <(sed -e s,$(INPATH),callcatcher,g $(SRCDIR)/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:: > unusedcode.easy
+
dev-install: smoketestoo_native
all: instsetoo_native
commit 912ad68d34488f81753ab50ef7a892a3b20161b1
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Nov 29 13:25:34 2011 +0100
move install target to gbuild
diff --git a/Makefile.in b/Makefile.in
index 2df1863..2a1407e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,13 +64,8 @@ fetch:
unitcheck:
@$(call forward_to_gbuild,$@)
-install: build
- @. ./Env.Host.sh && \
- echo "Installing in @INSTALLDIR at ..." && \
- ooinstall "@INSTALLDIR@" && \
- echo "" && \
- echo "Installation finished, you can now execute:" && \
- echo "@INSTALLDIR@/program/soffice"
+install:
+ @$(call forward_to_gbuild,$@)
ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index fcdf2f4..c137fb0 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-.PHONY: id tags docs distro-pack-install fetch clean-host clean-build bootstrap
+.PHONY: id tags docs distro-pack-install install fetch clean-host clean-build bootstrap
id:
@create-ids
@@ -72,6 +72,13 @@ distclean: clean
desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
+install: build
+ echo "Installing in $(INSTALLDIR)..." && \
+ ooinstall "$(INSTALLDIR)" && \
+ echo "" && \
+ echo "Installation finished, you can now execute:" && \
+ echo "$(INSTALLDIR)/program/soffice"
+
endif
More information about the Libreoffice-commits
mailing list