diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-31 22:51:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-01 00:45:56 +0200 |
| commit | fcca05c337bb0e4ffc2df88b4da4559f42598295 (patch) | |
| tree | f66abdfca61abffb392859e757e39c57a482b96f | |
| parent | a0c86b527ffdd1484c65d5e448c9d7cac9c02963 (diff) | |
Revert "update the list of serialized libs"
This reverts commit fd3a23ce33bdec454273ba2bb3ea307b8420bcc0.
The list of serialized libraries must be sorted in dependency order,
otherwise there will be cyclic dependencies.
| -rw-r--r-- | RepositoryModule_host.mk | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 6f16d13c76d1..93a2fe7cba0c 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -241,30 +241,15 @@ $(if $(strip $(1)),\ $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) endef -# this list consists of libraries above the arbitrary cut-off of 30M -# on a --enable-debug linux build ifeq (all,$(filter all,$(MAKECMDGOALS))) $(eval $(call repositorymodule_serialize,\ - chartcore \ - chartcontroller \ - cui \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ - fwk \ - $(if $(MERGELIBS),merged) \ - msword \ - oox \ - sc \ scfilt \ - sd \ - sfx \ - svt \ - svx \ - svxcore \ - sw \ - swui \ - vcl \ - writerfilter \ - xo \ + $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ + sc msword swui sw sd \ + $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ + writerfilter cui chartcontroller oox \ + $(if $(MERGELIBS),merged,svxcore) \ + xo vcl \ )) endif |