diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-08-29 16:56:23 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-08-31 03:32:41 +0200 |
| commit | 48e7a4eda8fd136f7d9b5a86e0d928e18ad0ad94 (patch) | |
| tree | e2bc1255678b790f24a54929426e03f99c1d8833 /Repository.mk | |
| parent | d8d2340a2ee130852d3be1d8330e6e7a720f999a (diff) | |
Move spsupp components to a separate installer feature
Change-Id: Ic95b9f887da83d0931ed54b76d23465660786a79
Reviewed-on: https://gerrit.libreoffice.org/78273
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 99dd418c94e2b85fca1a13a0c15aa117582da574)
Reviewed-on: https://gerrit.libreoffice.org/78295
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Repository.mk b/Repository.mk index 949605a8a29e..0de098bd6b1f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -206,7 +206,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ ) \ $(if $(filter WNT,$(OS)), \ senddoc \ - spsupp_helper \ ) \ )) @@ -674,17 +673,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin6 )) endif -ifneq ($(CXX_X64_BINARY),) -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ - spsupp_x64 \ +$(eval $(call gb_Helper_register_executables_for_install,OOO,spsuppfiles, \ + spsupp_helper \ )) -endif -ifneq ($(CXX_X86_BINARY),) -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ - spsupp_x86 \ +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,spsuppfiles, \ + $(if $(CXX_X64_BINARY),spsupp_x64) \ + $(if $(CXX_X86_BINARY),spsupp_x86) \ )) -endif $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \ $(if $(WINDOWS_SDK_HOME),\ |