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,\
endif
$(eval $(call gb_Library_use_externals,merged,\
boostdatetime \
$(if $(filter-out IOS,$(OS)),cdr) \
$(call gb_Helper_optional,DESKTOP,clucene) \
cmis \
cppunit \
cups \
curl \
expat_utf8 \
hunspell \
hyphen \
......@@ -63,6 +66,7 @@ $(eval $(call gb_Library_use_externals,merged,\
lcms2 \
libxml2 \
$(call gb_Helper_optional,DESKTOP,libxslt) \
$(if $(filter-out IOS,$(OS)),lpsolve) \
$(if $(filter-out IOS,$(OS)),mspub) \
$(if $(filter-out IOS,$(OS)),mwaw) \
mythes \
......
......@@ -97,15 +97,18 @@ gb_MERGEDLIBS := \
sax \
sb \
sc \
$(if $(DISABLE_SCRIPTING),,scriptframe) \
scui \
scfilt \
sd \
sdui \
sfx \
sofficeapp \
$(if $(filter-out IOS,$(OS)),solver) \
sot \
spell \
spl \
$(if $(DISABLE_SCRIPTING),,stringresource) \
subsequenttest \
svl \
svt \
......@@ -115,9 +118,11 @@ gb_MERGEDLIBS := \
swui \
swd \
test \
textfd \
tk \
$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
ucb1 \
ucpcmis1 \
ucpfile1 \
unotest \
utl \
......@@ -128,6 +133,8 @@ gb_MERGEDLIBS := \
$(if $(filter-out IOS,$(OS)),wpftdraw) \
$(if $(filter-out IOS,$(OS)),wpftwriter) \
writerfilter \
xmlfa \
xmlfd \
xmlscript \
xmlsecurity \
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