diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-28 21:29:27 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-28 22:28:57 +0100 |
| commit | e0aaa830fc6633a2ab5614eec4f4b88279dca908 (patch) | |
| tree | 3d493db4f8710b6d468bb9c9449d05a27f4cddf1 /scp2 | |
| parent | dedaf74392cbf09e165bd8164a905e146a2961fe (diff) | |
scp2: move xsltfilter packages to AutoInstall
Change-Id: I2ae844d43a875ea0b4eb9dd445e483a36a90f73d
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_xsltfilter.mk | 4 | ||||
| -rw-r--r-- | scp2/source/xsltfilter/file_xsltfilter.scp | 20 | ||||
| -rw-r--r-- | scp2/source/xsltfilter/module_xsltfilter.scp | 5 |
4 files changed, 7 insertions, 23 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index e271be86bf6d..5a7c4f9e7a82 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -53,5 +53,6 @@ $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE endif $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,xsltfilter,)) # vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_xsltfilter.mk b/scp2/InstallModule_xsltfilter.mk index 372328000fb8..7835254f5289 100644 --- a/scp2/InstallModule_xsltfilter.mk +++ b/scp2/InstallModule_xsltfilter.mk @@ -9,6 +9,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/xsltfilter)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/xsltfilter,\ + xsltfilter \ +)) + $(eval $(call gb_InstallModule_add_scpfiles,scp2/xsltfilter,\ scp2/source/xsltfilter/file_xsltfilter \ )) diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp index 36ba626fb6f7..04ad0b115f19 100644 --- a/scp2/source/xsltfilter/file_xsltfilter.scp +++ b/scp2/source/xsltfilter/file_xsltfilter.scp @@ -25,23 +25,3 @@ File gid_File_Share_Registry_Xsltfilter_Xcd Name = "xsltfilter.xcd"; End -File gid_File_filter_docbook - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "filter_docbook.filelist"; -End - -File gid_File_filter_xhtml - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "filter_xhtml.filelist"; -End - -File gid_File_filter_xslt - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "filter_xslt.filelist"; -End diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 0bb677602778..b4f5b936f9d4 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -18,15 +18,14 @@ #include "macros.inc" +#include "AutoInstall/xsltfilter" Module gid_Module_Optional_Xsltfiltersamples PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_XSLTFILTERSAMPLES); Sortkey = "700"; ParentID = gid_Module_Optional; - Files = ( gid_File_filter_docbook, - gid_File_filter_xhtml, - gid_File_filter_xslt, + Files = (auto_xsltfilter_ALL, gid_File_Share_Registry_Xsltfilter_Xcd ); Default = YES; Styles = ( ); |