Library_merged.mk | 6 ++++++
solenv/gbuild/extensions/pre_MergedLibsList.mk | 24 ++++++++++++++++++++++++
2 files changed, 30 insertions(+)
New commits:
commit 99ff52443e3e91376c306c33d0540f6ff9c45c2c
Author: Peter Foley <pefol...@verizon.net>
Date: Mon Apr 15 18:49:08 2013 -0400
add a bunch more libs to libmerged
Change-Id: Iafced50131c0aaf81c07d1e0bc91fd39547e6682
diff --git a/Library_merged.mk b/Library_merged.mk
index a26878c..c540e59 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 3340876..a799aaa 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 \
commit bf9a7829354c8f5e7459629262f02d9f23ab19c1
Author: Peter Foley <pefol...@verizon.net>
Date: Mon Apr 15 17:19:05 2013 -0400
add extensions libs to libmerged
Change-Id: I65a4358c3214c43714bc0d13a05a316799cafb24
diff --git a/Library_merged.mk b/Library_merged.mk
index e7a407d..a26878c 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -74,6 +74,7 @@ ifeq (ALL,$(MERGELIBS))
$(eval $(call gb_Library_use_externals,merged,\
cppunit \
libexslt \
+ $(if $(filter-out ANDROID IOS,$(OS)),openldap) \
$(call gb_Helper_optional,PYUNO,python) \
))
endif
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 7bc0bdc..3340876 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -28,11 +28,14 @@
ifneq ($(MERGELIBS),)
# set of libraries to link even more stuff into one merged library
gb_EXTRAMERGEDLIBS := \
+ $(if $(filter-out ANDROID IOS,$(OS)),abp) \
$(if $(filter unx,$(GUIBASE)),basebmp) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,bib) \
$(call gb_Helper_optional,DBCONNECTIVITY,calc) \
chartcore \
$(call gb_Helper_optional,DBCONNECTIVITY,dba) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbase) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,dbp) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
deploymentgui \
@@ -69,6 +72,8 @@ gb_EXTRAMERGEDLIBS := \
itg \
iti \
$(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \
+ $(if $(filter-out ANDROID IOS,$(OS)),log) \
+ $(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \
$(call gb_Helper_optional,DESKTOP,migrationoo2) \
$(call gb_Helper_optional,DESKTOP,migrationoo3) \
$(call gb_Helper_optional,DBCONNECTIVITY,mork) \
@@ -78,10 +83,13 @@ gb_EXTRAMERGEDLIBS := \
odfflatxml \
offacc \
oox \
+ $(call gb_Helper_optional,DBCONNECTIVITY,pcr) \
pdffilter \
placeware \
$(call gb_Helper_optional,PYUNO,pyuno) \
+ res \
$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
+ $(if $(filter-out ANDROID IOS,$(OS)),scn) \
sd \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
$(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),spl_unx) \
@@ -92,6 +100,7 @@ gb_EXTRAMERGEDLIBS := \
textfd \
$(call gb_Helper_optional,DESKTOP,unopkgapp) \
unotest \
+ $(call gb_Helper_optional,DESKTOP,updatefeed) \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
xmlfa \
xmlfd \
commit ec75af4d1d15553291e55b1229de4101ecf6934a
Author: Peter Foley <pefol...@verizon.net>
Date: Mon Apr 15 15:23:37 2013 -0400
add embeddedobj libs to libmerged
Change-Id: I8316103a94dc7284dad4ae7da2cf28ceb7e2ce50
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 75dc78ce..7bc0bdc 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -37,6 +37,8 @@ gb_EXTRAMERGEDLIBS := \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
deploymentgui \
$(call gb_Helper_optional,EXPORT,egi) \
+ embobj \
+ emboleobj \
$(call gb_Helper_optional,EXPORT,eme) \
$(call gb_Helper_optional,EXPORT,epb) \
$(call gb_Helper_optional,EXPORT,epg) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
