diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:15:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:59:17 +0200 |
| commit | f01aa96eab0ac6b068cff53ee03c10beff662f2d (patch) | |
| tree | 3244b125bf65fdf75173aaa459b7dceafb70c030 /Repository.mk | |
| parent | 5ac6c4818aa533746c84c1a42fb07b82bc7ec713 (diff) | |
scp2: move python libraries to AutoInstall
Change-Id: Ib89daf3e608fd995845062eae2a7a33149964844
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 4c1443acbe2a..763c5a4e1471 100644 --- a/Repository.mk +++ b/Repository.mk @@ -428,6 +428,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \ pdfimport \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,python, \ + pythonloader \ +)) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,python, \ + pyuno \ + $(if $(filter-out WNT,$(OS)),pyuno_wrapper) \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,reportbuilder, \ rpt \ rptui \ @@ -584,8 +593,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - pyuno \ - pyuno_wrapper \ xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ @@ -640,10 +647,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ salhelper \ )) -$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - pythonloader \ -)) - $(eval $(call gb_Helper_register_libraries_for_install,UNOVERLIBS,ure, \ cppu \ sal \ |