From 99dd418c94e2b85fca1a13a0c15aa117582da574 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Thu, 29 Aug 2019 16:56:23 +0300 Subject: 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 --- Repository.mk | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index d292bd461201..e4eadbd2b927 100644 --- a/Repository.mk +++ b/Repository.mk @@ -208,7 +208,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ ) \ $(if $(filter WNT,$(OS)), \ senddoc \ - spsupp_helper \ ) \ $(if $(filter OPENCL,$(BUILD_TYPE)),opencltest) \ )) @@ -673,17 +672,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),\ -- cgit