summaryrefslogtreecommitdiffstats
path: root/solenv/gbuild/extensions
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-05-04 09:24:21 -0400
committerPeter Foley <pefoley2@verizon.net>2013-05-04 09:25:28 -0400
commitba09793d3b566d30ecb49422ce02fe4b2e2c7600 (patch)
tree41ffc28984ea15c8209ffdca9ac70745b0a399d1 /solenv/gbuild/extensions
parentfdo#60924: autoinstall kde libraries (diff)
downloadcore-ba09793d3b566d30ecb49422ce02fe4b2e2c7600.tar.gz
core-ba09793d3b566d30ecb49422ce02fe4b2e2c7600.zip
do not merge pyuno/pyloader
Change-Id: I2803eaa9dcd516059fc879e1ca98dc3a5f088284
Diffstat (limited to 'solenv/gbuild/extensions')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 6cc023f41bed..496a402fcaaf 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -77,8 +77,6 @@ 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) \