summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-27 14:58:23 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-28 09:58:18 -0400
commitb49c71ff2968e29706480a030f1a57c05a948be9 (patch)
tree94b597be7c95012fda06aa0f1b4918b119d7b47a /Library_merged.mk
parentb270066390132819b749d704ced9db69268ee120 (diff)
add pyuno and pythonloader to Library_merged
Change-Id: Ib2bde93f7f99873c4c2f4d3857bb1ed5e3e7fd8a
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 7efcf9ec025e..7122e4fec8b4 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,merged,\
nss3 \
openssl \
orcus \
+ $(call gb_Helper_optional,PYUNO,python) \
$(if $(filter-out IOS,$(OS)),wpd) \
$(if $(filter-out IOS,$(OS)),wpg) \
$(if $(filter-out IOS,$(OS)),wps) \