mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add a bunch more libs to libmerged

Browse Source 
Change-Id: Iafced50131c0aaf81c07d1e0bc91fd39547e6682
This commit is contained in:
Peter Foley 2013-04-15 18:49:08 -04:00
parent bf9a782935
commit 99ff52443e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library_merged.mk
View File

@ -71,9 +71,14 @@ $(eval $(call gb_Library_use_externals,merged,\
)) ))
ifeq (ALL,$(MERGELIBS)) ifeq (ALL,$(MERGELIBS))
$(eval $(call gb_Library_use_static_libraries,merged,\
ulingu \
))
$(eval $(call gb_Library_use_externals,merged,\ $(eval $(call gb_Library_use_externals,merged,\
cppunit \ cppunit \
hyphen \
libexslt \ libexslt \
libexttextcat \
$(if $(filter-out ANDROID IOS,$(OS)),openldap) \ $(if $(filter-out ANDROID IOS,$(OS)),openldap) \
$(call gb_Helper_optional,PYUNO,python) \ $(call gb_Helper_optional,PYUNO,python) \
)) ))

15
solenv/gbuild/extensions/pre_MergedLibsList.mk
View File

@ -56,9 +56,15 @@ gb_EXTRAMERGEDLIBS := \
flash \ flash \
for \ for \
forui \ forui \
fpicker \
fps_office \
$(call gb_Helper_optional,DBCONNECTIVITY,frm) \
fwl \ fwl \
fwm \
graphicfilter \ graphicfilter \
guesslang \
$(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \ $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \
hyphen \
icd \ icd \
icg \ icg \
idx \ idx \
@ -72,8 +78,10 @@ gb_EXTRAMERGEDLIBS := \
itg \ itg \
iti \ iti \
$(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \
$(if $(filter-out ANDROID IOS,$(OS)),log) \
$(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \ $(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,migrationoo2) \
$(call gb_Helper_optional,DESKTOP,migrationoo3) \ $(call gb_Helper_optional,DESKTOP,migrationoo3) \
$(call gb_Helper_optional,DBCONNECTIVITY,mork) \ $(call gb_Helper_optional,DBCONNECTIVITY,mork) \
@ -86,12 +94,17 @@ gb_EXTRAMERGEDLIBS := \
$(call gb_Helper_optional,DBCONNECTIVITY,pcr) \ $(call gb_Helper_optional,DBCONNECTIVITY,pcr) \
pdffilter \ pdffilter \
placeware \ placeware \
$(call gb_Helper_optional,PYUNO,pythonloader) \
$(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,PYUNO,pyuno) \
res \ res \
$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ $(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) \ $(if $(filter-out ANDROID IOS,$(OS)),scn) \
sd \ sd \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
$(if $(filter unx,$(GUIBASE)),spa) \
spell \
$(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),spl_unx) \ $(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),spl_unx) \
svgfilter \ svgfilter \
swd \ swd \