Kaydet (Commit) a93f651c authored tarafından Peter Foley's avatar Peter Foley

add tl dependent libs to Library_merged

Change-Id: Idd99db9c6afce3b7713f6262927a0972d16ae418
üst d5b33798
...@@ -49,10 +49,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ ...@@ -49,10 +49,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\
endif endif
$(eval $(call gb_Library_use_externals,merged,\ $(eval $(call gb_Library_use_externals,merged,\
boostdatetime \
$(if $(filter-out IOS,$(OS)),cdr) \ $(if $(filter-out IOS,$(OS)),cdr) \
$(call gb_Helper_optional,DESKTOP,clucene) \ $(call gb_Helper_optional,DESKTOP,clucene) \
cmis \
cppunit \ cppunit \
cups \ cups \
curl \
expat_utf8 \ expat_utf8 \
hunspell \ hunspell \
hyphen \ hyphen \
...@@ -63,6 +66,7 @@ $(eval $(call gb_Library_use_externals,merged,\ ...@@ -63,6 +66,7 @@ $(eval $(call gb_Library_use_externals,merged,\
lcms2 \ lcms2 \
libxml2 \ libxml2 \
$(call gb_Helper_optional,DESKTOP,libxslt) \ $(call gb_Helper_optional,DESKTOP,libxslt) \
$(if $(filter-out IOS,$(OS)),lpsolve) \
$(if $(filter-out IOS,$(OS)),mspub) \ $(if $(filter-out IOS,$(OS)),mspub) \
$(if $(filter-out IOS,$(OS)),mwaw) \ $(if $(filter-out IOS,$(OS)),mwaw) \
mythes \ mythes \
......
...@@ -97,15 +97,18 @@ gb_MERGEDLIBS := \ ...@@ -97,15 +97,18 @@ gb_MERGEDLIBS := \
sax \ sax \
sb \ sb \
sc \ sc \
$(if $(DISABLE_SCRIPTING),,scriptframe) \
scui \ scui \
scfilt \ scfilt \
sd \ sd \
sdui \ sdui \
sfx \ sfx \
sofficeapp \ sofficeapp \
$(if $(filter-out IOS,$(OS)),solver) \
sot \ sot \
spell \ spell \
spl \ spl \
$(if $(DISABLE_SCRIPTING),,stringresource) \
subsequenttest \ subsequenttest \
svl \ svl \
svt \ svt \
...@@ -115,9 +118,11 @@ gb_MERGEDLIBS := \ ...@@ -115,9 +118,11 @@ gb_MERGEDLIBS := \
swui \ swui \
swd \ swd \
test \ test \
textfd \
tk \ tk \
$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
ucb1 \ ucb1 \
ucpcmis1 \
ucpfile1 \ ucpfile1 \
unotest \ unotest \
utl \ utl \
...@@ -128,6 +133,8 @@ gb_MERGEDLIBS := \ ...@@ -128,6 +133,8 @@ gb_MERGEDLIBS := \
$(if $(filter-out IOS,$(OS)),wpftdraw) \ $(if $(filter-out IOS,$(OS)),wpftdraw) \
$(if $(filter-out IOS,$(OS)),wpftwriter) \ $(if $(filter-out IOS,$(OS)),wpftwriter) \
writerfilter \ writerfilter \
xmlfa \
xmlfd \
xmlscript \ xmlscript \
xmlsecurity \ xmlsecurity \
xo \ xo \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment