diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-31 23:09:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-01 00:47:11 +0200 |
| commit | 9853280211974d20b519624c16b2e7e6f76e7400 (patch) | |
| tree | 1e67d2eaaa09d974afef135b6008a7c44e562734 | |
| parent | ab9b5f4095d3846cb0d66707bed8d2d36e586902 (diff) | |
RepositoryModule: add the libraries back from the reverted commit
... but this time hopefully topologically sorted.
Change-Id: I94960795d729d803641fe7bbf47797f733b56c40
(cherry picked from commit c70e55c5d8ecfd5bb690886d7e39a42f66b3702a)
| -rw-r--r-- | RepositoryModule_host.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 259ca29eb233..b9e64f2aea90 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -241,6 +241,8 @@ $(if $(strip $(1)),\ $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) endef +# DO NOT SORT ALPHABETICALLY: the libraries must be listed in dependency order, +# otherwise cyclic dependencies ruin everything. # do not serialize on a partial build as that may fail due to missing deps. # the default goal is all (see Module.mk) ifeq (,$(filter-out all,$(MAKECMDGOALS))) @@ -249,9 +251,9 @@ $(eval $(call repositorymodule_serialize,\ $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ sc msword swui sw sd \ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ - writerfilter cui chartcontroller oox \ + writerfilter cui chartcontroller chartcore oox svx \ $(if $(MERGELIBS),merged,svxcore) \ - xo vcl \ + xo sfx fwk svt vcl \ )) endif |