mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RepositoryModule: add the libraries back from the reverted commit

Browse Source 
... but this time hopefully topologically sorted.

Change-Id: I94960795d729d803641fe7bbf47797f733b56c40
This commit is contained in:
Michael Stahl
2013-05-31 23:09:20 +02:00
parent c4f7ed869f
commit c70e55c5d8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RepositoryModule_host.mk
View File

@@ -241,6 +241,8 @@ $(if $(strip $(1)),\
$(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1))))
endef 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. # do not serialize on a partial build as that may fail due to missing deps.
# the default goal is all (see Module.mk) # the default goal is all (see Module.mk)
ifeq (,$(filter-out all,$(MAKECMDGOALS))) ifeq (,$(filter-out all,$(MAKECMDGOALS)))
@@ -249,9 +251,9 @@ $(eval $(call repositorymodule_serialize,\
$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
sc msword swui sw sd \ sc msword swui sw sd \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
writerfilter cui chartcontroller oox \ writerfilter cui chartcontroller chartcore oox svx \
$(if $(MERGELIBS),merged,svxcore) \ $(if $(MERGELIBS),merged,svxcore) \
xo vcl \ xo sfx fwk svt vcl \
)) ))
endif endif