diff options
| -rw-r--r-- | Repository.mk | 14 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_spsupp.mk | 20 | ||||
| -rw-r--r-- | scp2/InstallScript_setup_osl.mk | 1 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
| -rw-r--r-- | scp2/source/spsupp/module_spsupp.scp | 26 |
6 files changed, 54 insertions, 9 deletions
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),\ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 7c9d6c4538bd..9b18c1ecce08 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -45,6 +45,7 @@ $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE, $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,SDK_PACKAGE_FILELIST)) +$(eval $(call gb_AutoInstall_add_module,spsuppfiles,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE)) diff --git a/scp2/InstallModule_spsupp.mk b/scp2/InstallModule_spsupp.mk new file mode 100644 index 000000000000..7d01a7b020ed --- /dev/null +++ b/scp2/InstallModule_spsupp.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_InstallModule_InstallModule,scp2/spsupp)) + +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/spsupp,\ + spsuppfiles \ +)) + +$(eval $(call gb_InstallModule_add_scpfiles,scp2/spsupp,\ + scp2/source/spsupp/module_spsupp \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index 081f9dc6e26c..0c3b97bef6d7 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -24,6 +24,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ $(if $(filter WNT,$(OS)),\ scp2/activex \ scp2/quickstart \ + scp2/spsupp \ scp2/windows \ $(if $(filter MSC,$(COM)),\ scp2/winexplorerext \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 33e89172afac..aa06d6301f85 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_onlineupdate \ InstallModule_ooo \ InstallModule_python \ + InstallModule_spsupp \ InstallModule_ure \ InstallModule_writer \ InstallModule_xsltfilter \ diff --git a/scp2/source/spsupp/module_spsupp.scp b/scp2/source/spsupp/module_spsupp.scp new file mode 100644 index 000000000000..39c547a5fa5c --- /dev/null +++ b/scp2/source/spsupp/module_spsupp.scp @@ -0,0 +1,26 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "macros.inc" + +#include "AutoInstall/spsuppfiles" + +#ifdef WNT + +Module gid_Module_Optional_SharePointSupport + ParentID = gid_Module_Optional; + Name = "gid_Module_Optional_SharePointSupport"; + Description = "gid_Module_Optional_SharePointSupport"; + Sortkey = "1300"; + Default = YES; + Styles = (HIDDEN_ROOT); + Files = (auto_spsuppfiles_ALL); +End + +#endif + |