diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-05-08 15:22:13 -0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-09 12:58:40 +0000 |
| commit | c058341b6de3730b404f44347bea408243416379 (patch) | |
| tree | 02ab3eb226e6b9c3931fec5fbb006f5e2744f0d6 /scp2 | |
| parent | bfaff2a51f67a9e33f1d8fc11ab91f364a49c50d (diff) | |
fdo#60924: autoinstall graphicfilter libraries
Change-Id: I406ecef9bc1865d0cd17e3428bffaaaa137d972f
Reviewed-on: https://gerrit.libreoffice.org/3829
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_graphicfilter.mk | 4 | ||||
| -rw-r--r-- | scp2/source/graphicfilter/file_graphicfilter.scp | 7 | ||||
| -rw-r--r-- | scp2/source/graphicfilter/module_graphicfilter.scp | 6 |
3 files changed, 1 insertions, 16 deletions
diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index 1858d9394b81..f166e2569928 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -11,10 +11,6 @@ $(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 \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/module_graphicfilter \ )) diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index 535688ded532..2fdffb4506c8 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -34,11 +34,4 @@ File gid_File_Share_Registry_Graphicfilter_Xcd Name = "graphicfilter.xcd"; End -STD_LIB_FILE( gid_File_Lib_Flash, flash ) STD_RES_FILE( gid_File_Res_Flash, flash ) - -STD_LIB_FILE( gid_File_Lib_Svg, svgfilter ) - -STD_LIB_FILE( gid_File_Lib_Graphic, graphicfilter ) - -STD_LIB_FILE( gid_File_Lib_WpftDraw, wpftdraw ) diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index e86e6a5c8538..9ebfcc2dde4b 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -35,10 +35,6 @@ Module gid_Module_Optional_Grfflt Sortkey = "600"; ParentID = gid_Module_Optional; Default = YES; - Files = ( - gid_File_Lib_Svg, - gid_File_Lib_Flash, - gid_File_Lib_WpftDraw, - gid_File_Lib_Graphic, + Files = (auto_Graphicfilter_Lib_ALL gid_File_Share_Registry_Graphicfilter_Xcd); End |