diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-05-27 19:13:14 -0300 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-01 07:03:56 +0000 |
| commit | 8a58bc2535cf0c8459d861d29b342ef39f7f833c (patch) | |
| tree | fd30814a74b2355ba1a4e455111563a1821bb95b /scp2 | |
| parent | 4dccfe055e93fe86ee7604c9137ae189cbc74823 (diff) | |
fdo#60924 autoinstall - gbuild/scp2: add math module
Change-Id: I466dd68069576d57740ef34b8f6fcd8f9025c5c8
Reviewed-on: https://gerrit.libreoffice.org/4065
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstallLibs_math.mk | 12 | ||||
| -rw-r--r-- | scp2/InstallModule_math.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
| -rw-r--r-- | scp2/source/math/file_math.scp | 4 | ||||
| -rw-r--r-- | scp2/source/math/module_math.scp | 5 |
5 files changed, 19 insertions, 5 deletions
diff --git a/scp2/AutoInstallLibs_math.mk b/scp2/AutoInstallLibs_math.mk new file mode 100644 index 000000000000..a7ceda857ef6 --- /dev/null +++ b/scp2/AutoInstallLibs_math.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,math,MATH,LIBO_LIB_FILE,auto_Math_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk index 57f5c2d5e9b8..e25c25e3f388 100644 --- a/scp2/InstallModule_math.mk +++ b/scp2/InstallModule_math.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/math)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,math)) + $(eval $(call gb_InstallModule_add_templates,scp2/math,\ scp2/source/templates/module_langpack_math \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index f34449f13356..3178920ea7c2 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -15,6 +15,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ AutoInstallLibs_tde \ AutoInstallLibs_gnome \ AutoInstallLibs_kde \ + AutoInstallLibs_math \ AutoInstallLibs_ooo \ AutoInstallLibs_ure \ AutoInstallLibs_writer \ diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 0c016eeb6a3e..d9ccc9662b93 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -27,10 +27,6 @@ #include "macros.inc" -STD_LIB_FILE( gid_File_Lib_Sm , sm) - -STD_LIB_FILE( gid_File_Lib_Smd , smd) - STD_RES_FILE( gid_File_Res_Sm, sm ) File gid_File_Share_Registry_Math_Xcd diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index f222441103f2..16266237aa70 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#include "AutoInstallLibs/math" + Module gid_Module_Prg_Math MOD_NAME_DESC ( MODULE_PRG_MATH ); ParentID = gid_Module_Prg; @@ -42,7 +44,8 @@ Module gid_Module_Prg_Math_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, + Files = (auto_Math_Lib_ALL + gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, gid_File_Share_Registry_Math_Xcd, gid_File_Tmp_Userinstall_Math_Inf); End |