fdo#60924 autoinstall - gbuild/scp2: add kde module
Change-Id: Id1a836da9b97ba2b542b68cfa650fede523b0a0e
diff --git a/Repository.mk b/Repository.mk
index d771646..f46ac63 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -217,6 +217,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
avmedia \
$(if $(DISABLE_SCRIPTING),,basctl) \
diff --git a/scp2/AutoInstallLibs_kde.mk b/scp2/AutoInstallLibs_kde.mk
new file mode 100644
index 0000000..11f65ee
--- /dev/null
+++ b/scp2/AutoInstallLibs_kde.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,kde,KDE,LIBO_LIB_FILE,auto_Kde_Lib))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_kde.mk b/scp2/InstallModule_kde.mk
index 9d0a9bd..11d5f96 100644
--- a/scp2/InstallModule_kde.mk
+++ b/scp2/InstallModule_kde.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/kde))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/kde,kde))
$(eval $(call gb_InstallModule_define_if_set,scp2/kde,\
ENABLE_KDE \
ENABLE_KDE4 \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 41fbf96..4173445 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_kde \
AutoInstallLibs_ooo \
AutoInstallLibs_ure \
AutoInstallLibs_writer \
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index f1bc11c..9d37195 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
#include "AutoInstallLibs/kde"
#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
Module gid_Module_Optional_Kde
ParentID = gid_Module_Optional;
@@ -34,7 +36,7 @@ Module gid_Module_Optional_Kde
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = ();
Files = (
Files = (auto_Kde_Lib_ALL
#ifdef ENABLE_KDE
gid_File_Lib_Kdebe
#ifdef ENABLE_KDE4
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index e0a61cc..ded46b9 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 := OOO URE WRITER
gb_Library_VALIDINSTALLMODULES := KDE OOO URE WRITER
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT NONE
