diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-27 21:47:41 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:21 -0400 |
| commit | a93f651c345d3646c8720ac5b03346812f91aa9e (patch) | |
| tree | b45695fe492837e8d8ade3cf5947ab5db6827a58 | |
| parent | d5b337980d2f2d687e926f1a9055c6c18d634ad8 (diff) | |
add tl dependent libs to Library_merged
Change-Id: Idd99db9c6afce3b7713f6262927a0972d16ae418
| -rw-r--r-- | Library_merged.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 7122e4fec8b4..d712028f662d 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -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 \ 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 \ |