diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-05-07 11:44:32 -0300 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-07 22:36:12 +0200 |
commit | 36564f36a8db30a9bd8ea4a50d2137b80c5052b6 (patch) | |
tree | de6210ff1108a80e5870d542cd0c9def6fa56620 | |
parent | 71ab998159e294ed91c24f483175de8696b3ae34 (diff) |
fdo#60924 autoinstall - gbuild/scp2: add gnome module
Conflicts:
Repository.mk
scp2/Module_scp2.mk
solenv/gbuild/Helper.mk
Change-Id: I37570787815d85d30eed3b5291e1e4450e5ffd51
-rw-r--r-- | Repository.mk | 3 | ||||
-rw-r--r-- | scp2/AutoInstallLibs_gnome.mk | 12 | ||||
-rw-r--r-- | scp2/InstallModule_gnome.mk | 2 | ||||
-rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
-rw-r--r-- | scp2/source/gnome/module_gnome.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 89e1459e5b3a..7e6c05120f4e 100644 --- a/Repository.mk +++ b/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) \ diff --git a/scp2/AutoInstallLibs_gnome.mk b/scp2/AutoInstallLibs_gnome.mk new file mode 100644 index 000000000000..c388a2948a5e --- /dev/null +++ b/scp2/AutoInstallLibs_gnome.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,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 816f3b244b52..3a8dd517beb8 100644 --- a/scp2/InstallModule_gnome.mk +++ b/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 \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index b5bb1f01e405..67e8a810c069 100644 --- a/scp2/Module_scp2.mk +++ b/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 \ diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 3a2604d09590..b496ced9bbbc 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/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 diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index fd395f7c5e31..168cdf7ccc52 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 := 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 |