From a93f651c345d3646c8720ac5b03346812f91aa9e Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 27 Mar 2013 21:47:41 -0400 Subject: add tl dependent libs to Library_merged Change-Id: Idd99db9c6afce3b7713f6262927a0972d16ae418 --- solenv/gbuild/extensions/pre_MergedLibsList.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'solenv') diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index d5152080fce5..a8acf370366c 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -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 \ -- cgit