diff options
| -rw-r--r-- | Repository.mk | 3 | ||||
| -rw-r--r-- | scp2/AutoInstallLibs_tde.mk | 12 | ||||
| -rw-r--r-- | scp2/InstallModule_tde.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
| -rw-r--r-- | scp2/source/tde/module_tde.scp | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 |
6 files changed, 22 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index 0160fe72f3d4..8d86cb6fd657 100644 --- a/Repository.mk +++ b/Repository.mk @@ -221,6 +221,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ $(if $(ENABLE_KDE),kdebe1) \ $(if $(ENABLE_KDE4),kde4be1) \ diff --git a/scp2/AutoInstallLibs_tde.mk b/scp2/AutoInstallLibs_tde.mk new file mode 100644 index 000000000000..daea3c3d1801 --- /dev/null +++ b/scp2/AutoInstallLibs_tde.mk @@ -0,0 +1,12 @@ +# -*- 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_AutoInstallLibs_AutoInstallLibs,tde,TDE,LIBO_LIB_FILE,auto_Tde_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk index f42ef03168f8..ad7655ed8dcd 100644 --- a/scp2/InstallModule_tde.mk +++ b/scp2/InstallModule_tde.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/tde)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/tde,tde)) + $(eval $(call gb_InstallModule_define_if_set,scp2/tde,\ ENABLE_TDE \ ENABLE_TDEAB \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 4173445d8417..b5bb1f01e405 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ + AutoInstallLibs_tde \ AutoInstallLibs_kde \ AutoInstallLibs_ooo \ AutoInstallLibs_ure \ diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index e302c5496a32..2cadd9714d59 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -24,6 +24,8 @@ #include "macros.inc" +#include "AutoInstallLibs/tde" + #if defined( ENABLE_TDE ) Module gid_Module_Optional_Tde ParentID = gid_Module_Optional; @@ -31,7 +33,7 @@ Module gid_Module_Optional_Tde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); - Files = ( + Files = (auto_Tde_Lib_ALL #ifdef ENABLE_TDE gid_File_Lib_Tdebe #endif // ENABLE_TDE diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index ded46b9f1eda..fd395f7c5e31 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ endef define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := KDE OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := TDE KDE OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE |