diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-05-08 14:24:57 -0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-09 03:30:52 +0000 |
| commit | 67dd958fdbaf4949d188d825b0724615966129d0 (patch) | |
| tree | e8ee05b2e78cbee7bb53673f7e11a86469723346 /scp2 | |
| parent | f9f421d4428c901aa0bc9483ac3835e7950c657d (diff) | |
fdo#60924 autoinstall - gbuild/scp2: add graphicfilter module
Change-Id: I7823b4f0d8b7ab99ef549361a89f12036bf63270
Reviewed-on: https://gerrit.libreoffice.org/3827
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstallLibs_graphicfilter.mk | 12 | ||||
| -rw-r--r-- | scp2/InstallModule_graphicfilter.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
| -rw-r--r-- | scp2/source/graphicfilter/module_graphicfilter.scp | 4 |
4 files changed, 18 insertions, 1 deletions
diff --git a/scp2/AutoInstallLibs_graphicfilter.mk b/scp2/AutoInstallLibs_graphicfilter.mk new file mode 100644 index 000000000000..08efa78569cc --- /dev/null +++ b/scp2/AutoInstallLibs_graphicfilter.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,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index b7f2a8c2f724..1858d9394b81 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter)) + $(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/file_graphicfilter \ )) diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 67e8a810c069..5bccae0d5140 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_graphicfilter \ AutoInstallLibs_tde \ AutoInstallLibs_gnome \ AutoInstallLibs_kde \ diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index cd7e4a6809af..bd148a879911 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -27,13 +27,15 @@ #include "macros.inc" +#include "AutoInstallLibs/graphicfilter" + Module gid_Module_Optional_Grfflt PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC ( MODULE_OPTIONAL_GRFFLT ); Sortkey = "600"; ParentID = gid_Module_Optional; Default = YES; - Files = ( + Files = (auto_Graphicfilter_Lib_ALL gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WpftDraw, |