fdo#60924 autoinstall - gbuild/scp2: add gnome module

Conflicts:
	Repository.mk
	scp2/Module_scp2.mk
	solenv/gbuild/Helper.mk

Change-Id: I37570787815d85d30eed3b5291e1e4450e5ffd51

Repository.mk

@@ -225,6 +225,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
     $(if $(ENABLE_TDE),tdebe1) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
     $(if $(ENABLE_KDE),kdebe1) \
     $(if $(ENABLE_KDE4),kde4be1) \

scp2/AutoInstallLibs_gnome.mk

+# -*- 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,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib))
+
+# vim: set noet sw=4 ts=4:

scp2/InstallModule_gnome.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
+
 $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
 	ENABLE_EVOAB2 \
 	ENABLE_GCONF \

scp2/Module_scp2.mk

@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,scp2))
 
 $(eval $(call gb_Module_add_targets,scp2,\
 	AutoInstallLibs_tde \
+	AutoInstallLibs_gnome \
 	AutoInstallLibs_kde \
 	AutoInstallLibs_ooo \
 	AutoInstallLibs_ure \

scp2/source/gnome/module_gnome.scp

@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstallLibs/gnome"
+
 Module gid_Module_Optional_Gnome
     ParentID = gid_Module_Optional;
     Default = YES;
@@ -36,7 +38,7 @@ Module gid_Module_Optional_Gnome
 #ifdef ENABLE_GNOMEVFS
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
-    Files = (
+    Files = (auto_Gnome_lib_ALL
 #ifdef ENABLE_EVOAB2
       gid_File_Lib_Evoab,
 #endif

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 := TDE KDE OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := GNOME TDE KDE OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE