diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-06-04 13:41:12 -0300 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-06 12:46:10 +0000 |
| commit | 53070b048afcc7eaf1dbe79eecadb4045e65c342 (patch) | |
| tree | 219f358956015ef2b72b6d4353dba6d6f46efb61 /scp2 | |
| parent | 7d257ffb1365aec5a2fa798bee832400b9d41ad3 (diff) | |
fdo#60924 autoinstall - gbuild/scp2: add base module
Change-Id: Iee1000ff245c369446a9e671a3f7c637f76f989b
Reviewed-on: https://gerrit.libreoffice.org/4153
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Tested-by: Matúš Kukan <matus.kukan@gmail.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstallLibs_base.mk | 12 | ||||
| -rw-r--r-- | scp2/InstallModule_base.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
| -rw-r--r-- | scp2/source/base/file_base.scp | 3 | ||||
| -rw-r--r-- | scp2/source/base/module_base.scp | 7 |
5 files changed, 18 insertions, 7 deletions
diff --git a/scp2/AutoInstallLibs_base.mk b/scp2/AutoInstallLibs_base.mk new file mode 100644 index 000000000000..5cb70c28f4d6 --- /dev/null +++ b/scp2/AutoInstallLibs_base.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,base,BASE,LIBO_LIB_FILE,auto_Base_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk index e3609f4f8ce1..d9561421fd45 100644 --- a/scp2/InstallModule_base.mk +++ b/scp2/InstallModule_base.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base)) + # Not sure about that? #$(eval $(call gb_InstallModule_define_if_set,scp2/base,\ # ENABLE_REPORTBUILDER \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 3178920ea7c2..ce1fb02782f5 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_base \ AutoInstallLibs_onlineupdate \ AutoInstallLibs_graphicfilter \ AutoInstallLibs_tde \ diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index f4eaad99246b..c11105662188 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -36,13 +36,10 @@ File gid_File_Exe_Odbcconfig End #endif -STD_LIB_FILE( gid_File_Lib_Abp, abp) STD_RES_FILE( gid_File_Res_Abp, abp) -STD_LIB_FILE( gid_File_Lib_Dbp, dbp) STD_RES_FILE( gid_File_Res_Dbp, dbp) -STD_LIB_FILE( gid_File_Lib_Dbu, dbu ) STD_RES_FILE( gid_File_Res_Dbu, dbu) STD_RES_FILE( gid_File_Res_Cnr, cnr) diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index ce28fae9879b..615cbddedf5f 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -18,6 +18,8 @@ #include "macros.inc" +#include "AutoInstallLibs/base" + Module gid_Module_Prg_Base MOD_NAME_DESC(MODULE_PRG_BASE); ParentID = gid_Module_Prg; @@ -33,11 +35,8 @@ Module gid_Module_Prg_Base_Bin Minimal = NO; Default = YES; Styles = (HIDDEN_ROOT); - Files = ( + Files = (auto_Base_Lib_ALL gid_File_Share_Registry_Base_Xcd - ,gid_File_Lib_Abp - ,gid_File_Lib_Dbp - ,gid_File_Lib_Dbu ); End |