summaryrefslogtreecommitdiffstats
path: root/solenv/gbuild/extensions
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-04-14 17:24:38 -0400
committerPeter Foley <pefoley2@verizon.net>2013-04-14 18:50:23 -0400
commit1472c5ed16744e1ec918fdb18feaf868dd5a1c47 (patch)
tree8005153a8752b1f5244ec5e3553b7a1faa217d22 /solenv/gbuild/extensions
parentDon't build unneccesary libraries twice (diff)
downloadcore-1472c5ed16744e1ec918fdb18feaf868dd5a1c47.tar.gz
core-1472c5ed16744e1ec918fdb18feaf868dd5a1c47.zip
add filter libs to libmerged
Change-Id: I1891d1499aae87a87436bc9aaf4f70203dfbb585
Diffstat (limited to 'solenv/gbuild/extensions')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk36
1 files changed, 35 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b0cb22fb8851..a0209c8c4422 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -33,23 +33,57 @@ gb_EXTRAMERGEDLIBS := \
$(call gb_Helper_optional,DBCONNECTIVITY,dba) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
+ $(call gb_Helper_optional,EXPORT,egi) \
+ $(call gb_Helper_optional,EXPORT,eme) \
+ $(call gb_Helper_optional,EXPORT,epb) \
+ $(call gb_Helper_optional,EXPORT,epg) \
+ $(call gb_Helper_optional,EXPORT,epp) \
+ $(call gb_Helper_optional,EXPORT,eps) \
+ $(call gb_Helper_optional,EXPORT,ept) \
+ $(call gb_Helper_optional,EXPORT,era) \
+ $(call gb_Helper_optional,EXPORT,eti) \
+ $(call gb_Helper_optional,EXPORT,exp) \
$(call gb_Helper_optional,DBCONNECTIVITY,file) \
+ flash \
for \
forui \
fwl \
+ graphicfilter \
+ icd \
+ icg \
+ idx \
+ ime \
+ ipb \
+ ipd \
+ ips \
+ ipt \
+ ipx \
+ ira \
+ itg \
+ iti \
$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
+ odfflatxml \
oox \
+ pdffilter \
+ placeware \
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
sd \
+ svgfilter \
swd \
+ t602filter \
test \
+ textfd \
unotest \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
- xmlsecurity
+ xmlfa \
+ xmlfd \
+ xmlsecurity \
+ xsltfilter
# FIXME: just retaining these for now - they currently crash & need thought.
#gb_EXTRAMERGEDLIBS := \
+ comphelper \
sc \
sw \