diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-11 12:40:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-11 12:46:10 +0100 |
| commit | a248f1bc574ae4975c4dd3609e0a82f48c3a06fd (patch) | |
| tree | 92d12356dc4f7e679d2d56e1f6eb44e77802f9f4 /Module_tail_build.mk | |
| parent | cc632da72ba7fe7e7f14b55e72a501afe930b329 (diff) | |
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
Diffstat (limited to 'Module_tail_build.mk')
| -rw-r--r-- | Module_tail_build.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index a6d58a49b185..e299bc35b675 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: |