diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-06-06 15:27:41 -0300 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-06 22:30:59 +0000 |
| commit | a6f81b3a98e136afabda512b4082b2be05490b34 (patch) | |
| tree | ad8167dbabc7d95f31c8a363afe5bad1377439a4 /scp2 | |
| parent | a5b8cc67c448ba724132988302fbfb643d2c1630 (diff) | |
fdo#60924 autoinstall - gbuild/scp2: add impress module
Change-Id: Id1256a9b62d72bce6a225d2b022865a31c01e25d
Reviewed-on: https://gerrit.libreoffice.org/4180
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_impress.mk | 12 | ||||
| -rw-r--r-- | scp2/InstallModule_impress.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
| -rw-r--r-- | scp2/source/impress/file_impress.scp | 12 | ||||
| -rw-r--r-- | scp2/source/impress/module_impress.scp | 5 |
5 files changed, 17 insertions, 15 deletions
diff --git a/scp2/AutoInstallLibs_impress.mk b/scp2/AutoInstallLibs_impress.mk new file mode 100644 index 000000000000..597e12b7d9e2 --- /dev/null +++ b/scp2/AutoInstallLibs_impress.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,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk index 0deac6698e03..48b786da109a 100644 --- a/scp2/InstallModule_impress.mk +++ b/scp2/InstallModule_impress.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/impress)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress)) + $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\ ENABLE_OPENGL \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index ce1fb02782f5..7d935feb588e 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ AutoInstallLibs_onlineupdate \ AutoInstallLibs_graphicfilter \ AutoInstallLibs_tde \ + AutoInstallLibs_impress \ AutoInstallLibs_gnome \ AutoInstallLibs_kde \ AutoInstallLibs_math \ diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index d01ee3600af1..7cf3eb57bf75 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -18,18 +18,6 @@ #include "macros.inc" -File gid_File_Lib_Placeware - Name = LIBNAME(placeware); - PACKED_LIB_FILE_BODY; -End - -File gid_File_Lib_Animcore - Name = LIBNAME(animcore); - PACKED_LIB_FILE_BODY; -End - -STD_LIB_FILE( gid_File_Lib_PresenterScreen, PresenterScreen ) - File gid_File_Share_Registry_Impress_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 9fc78a3871de..5393c715157e 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -33,10 +33,9 @@ Module gid_Module_Prg_Impress_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware, - gid_File_Lib_PresenterScreen, + Files = (auto_Impress_Lib_ALL + gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress, gid_File_Share_Registry_Impress_Xcd, - gid_File_Lib_Animcore, gid_File_sd_xml, gid_File_Tmp_Userinstall_Impress_Inf); End |