[Libreoffice-commits] .: Module_tail_build.mk
Michael Meeks
michael at kemper.freedesktop.org
Wed Jul 11 01:57:37 PDT 2012
Module_tail_build.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 88880514d2f2b1c1fdc199591d9e2b2ce259964f
Author: Michael Meeks <michael.meeks at suse.com>
Date: Wed Jul 11 09:54:22 2012 +0100
serialize more linking, and handle the pathological mergelibs case
Change-Id: I0c4b1e4d7d5e4802dbea0a1c5a9ec80874f7ed21
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 533dd24..a6d58a4 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -164,6 +164,12 @@ $(if $(strip $(1)),\
$(call tailbuild_serialize,$(wordlist 2,$(words $(1)),$(1))))
endef
-$(eval $(call tailbuild_serialize,scfilt sc sw sd $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) oox svxcore vcl xo))
+$(eval $(call tailbuild_serialize,\
+ scfilt sc sw sd \
+ $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \
+ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
+ oox vcl xo writerfilter cui chartcontroller swui \
+ vbaobj msword \
+))
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list