diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2014-02-06 13:53:17 -0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-10 13:23:33 +0000 |
| commit | 4af38b099c741c3676aefeb20c515913aaeed666 (patch) | |
| tree | 7c0fe178e6390de0b9431d1e9cab09d63ee0b9a3 /Repository.mk | |
| parent | d06d5e32a04602591827b32fc860bb0536115ddb (diff) | |
fdo#60924: Move some packages to autoinstall
Change-Id: I5805c8d1c9978b8625ba0e0ea6c4337baf5a6cb5
Reviewed-on: https://gerrit.libreoffice.org/7903
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Repository.mk b/Repository.mk index 1b0396a5cb85..b702ae349c69 100644 --- a/Repository.mk +++ b/Repository.mk @@ -451,9 +451,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ affine_uno_uno \ - $(if $(ENABLE_JAVA),java_uno) \ - $(if $(ENABLE_JAVA),juh) \ - $(if $(ENABLE_JAVA),juhx) \ + $(if $(filter MSC,$(COM)),cli_uno) \ + $(if $(ENABLE_JAVA), \ + java_uno \ + jpipe \ + $(if $(filter $(OS),WNT),jpipx) \ + juh \ + juhx \ + ) \ log_uno_uno \ unsafe_uno_uno \ $(if $(URELIBS),urelibs) \ @@ -491,11 +496,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ $(if $(filter MSC,$(COM)),cli_cppuhelper) \ )) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ - $(if $(filter MSC,$(COM)),cli_uno) \ - jpipe \ - $(if $(filter WNT,$(OS)),jpipx) \ -)) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_VLC),avmediavlc) \ @@ -706,6 +706,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\ ) \ )) +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + $(if $(SYSTEM_CURL),,curl) \ + $(if $(SYSTEM_LCMS2),,lcms2) \ + $(if $(SYSTEM_LIBXSLT),,xslt) \ +)) + # External executables $(eval $(call gb_ExternalExecutable_register_executables,\ genbrk \ |