diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2014-02-12 06:53:02 -0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-17 11:39:27 +0100 |
| commit | f70343bbbb2dd1160edace1a2f457fb3b33a7322 (patch) | |
| tree | e50072e7cb7dea621bdf4796db0ac8958845579d /Repository.mk | |
| parent | 067d08029384af6e620f0fc48e31ff2a740e1fc8 (diff) | |
fdo#60924: Move more libs/packages to autoinstall
Change-Id: I687f45eeea1e60e8076222865bd803c2ad18f758
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index b702ae349c69..79afd37e4f7c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -530,9 +530,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ sdbc2 \ sofficeapp \ srtrs1 \ + $(if $(filter $(OS),WNT),sysdtrans) \ textconv_dict \ ucb1 \ ucbhelper \ + $(if $(DISABLE_NEON),,ucpdav1) \ ucpfile1 \ ucpftp1 \ ucpchelp1 \ @@ -561,7 +563,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pyuno \ pyuno_wrapper \ - ucpdav1 \ xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ @@ -606,7 +607,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ regpatchactivex \ so_activex \ so_activex_x64 \ - sysdtrans \ thidxmsi \ )) endif @@ -710,6 +710,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(if $(SYSTEM_CURL),,curl) \ $(if $(SYSTEM_LCMS2),,lcms2) \ $(if $(SYSTEM_LIBXSLT),,xslt) \ + $(if $(SYSTEM_CAIRO),,cairo \ + $(if $(filter $(OS),WNT),,pixman) \ + ) \ )) # External executables |