Module_tail_build.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a248f1bc574ae4975c4dd3609e0a82f48c3a06fd
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 11 12:40:49 2012 +0100
tailbuild_serialize things seem to need to be in reverse dependency order
otherwise I get very confusing circular dependency errors in a clean build
Change-Id: I2a32d3053cfc0269fd77702125e3498e61f09e4d
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a6d58a4..e299bc3 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -165,11 +165,11 @@ $(call tailbuild_serialize,$(wordlist 2,$(words
$(1)),$(1))))
endef
$(eval $(call tailbuild_serialize,\
- scfilt sc sw sd \
- $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \
+ scfilt vbaobj sc msword swui sw sd \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
- oox vcl xo writerfilter cui chartcontroller swui \
- vbaobj msword \
+ writerfilter cui chartcontroller \
+ $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \
+ oox vcl xo \
))
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
