diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-15 18:49:08 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-15 19:00:53 -0400 |
| commit | 99ff52443e3e91376c306c33d0540f6ff9c45c2c (patch) | |
| tree | bb95fd93f7465dec8574b2ec867e00ba7bac89fa | |
| parent | add extensions libs to libmerged (diff) | |
| download | core-99ff52443e3e91376c306c33d0540f6ff9c45c2c.tar.gz core-99ff52443e3e91376c306c33d0540f6ff9c45c2c.zip | |
add a bunch more libs to libmerged
Change-Id: Iafced50131c0aaf81c07d1e0bc91fd39547e6682
| -rw-r--r-- | Library_merged.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index a26878c59494..c540e59f7a71 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -71,9 +71,14 @@ $(eval $(call gb_Library_use_externals,merged,\ )) ifeq (ALL,$(MERGELIBS)) +$(eval $(call gb_Library_use_static_libraries,merged,\ + ulingu \ +)) $(eval $(call gb_Library_use_externals,merged,\ cppunit \ + hyphen \ libexslt \ + libexttextcat \ $(if $(filter-out ANDROID IOS,$(OS)),openldap) \ $(call gb_Helper_optional,PYUNO,python) \ )) diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 3340876c9995..a799aaacc364 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -56,9 +56,15 @@ gb_EXTRAMERGEDLIBS := \ flash \ for \ forui \ + fpicker \ + fps_office \ + $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ fwl \ + fwm \ graphicfilter \ + guesslang \ $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \ + hyphen \ icd \ icg \ idx \ @@ -72,8 +78,10 @@ gb_EXTRAMERGEDLIBS := \ itg \ iti \ $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \ - $(if $(filter-out ANDROID IOS,$(OS)),log) \ $(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \ + lnth \ + $(if $(filter-out ANDROID IOS,$(OS)),log) \ + lwpft \ $(call gb_Helper_optional,DESKTOP,migrationoo2) \ $(call gb_Helper_optional,DESKTOP,migrationoo3) \ $(call gb_Helper_optional,DBCONNECTIVITY,mork) \ @@ -86,12 +94,17 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,pcr) \ pdffilter \ placeware \ + $(call gb_Helper_optional,PYUNO,pythonloader) \ $(call gb_Helper_optional,PYUNO,pyuno) \ res \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ + $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ + $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ $(if $(filter-out ANDROID IOS,$(OS)),scn) \ sd \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \ + $(if $(filter unx,$(GUIBASE)),spa) \ + spell \ $(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),spl_unx) \ svgfilter \ swd \ |