diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-04-27 09:26:14 -0300 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-27 18:48:09 +0000 |
commit | 3202b637c7f9fcbf05b30cb2a231be573e346be6 (patch) | |
tree | 41683c9d2736e722328a7032ec3114fbd9b11ed7 | |
parent | this is stupid anyhow (diff) | |
download | core-3202b637c7f9fcbf05b30cb2a231be573e346be6.tar.gz core-3202b637c7f9fcbf05b30cb2a231be573e346be6.zip |
fdo#60924: Move some libs to autoinstallation
Change-Id: I58421587784260bd88994926bca031ab26a6214f
Reviewed-on: https://gerrit.libreoffice.org/3630
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Tested-by: Matúš Kukan <matus.kukan@gmail.com>
-rw-r--r-- | Repository.mk | 48 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 48 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 23 |
3 files changed, 24 insertions, 95 deletions
diff --git a/Repository.mk b/Repository.mk index 6a0e2979d25d..60c0170de6b8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -236,7 +236,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ drawinglayer \ editeng \ + egi \ + eme \ $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \ + epb \ + epg \ + epp \ + eps \ + ept \ + era \ + eti \ + exp \ file \ filterconfig \ for \ @@ -248,6 +258,18 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ fwl \ fwm \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ + icd \ + icg \ + idx \ + ime \ + ipb \ + ipd \ + ips \ + ipt \ + ipx \ + ira \ + itg \ + iti \ lng \ $(if $(MERGELIBS),merged) \ msfilter \ @@ -255,9 +277,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ sax \ sb \ sdbt \ + sdfilt \ sfx \ sot \ $(if $(ENABLE_HEADLESS),,spl) \ + svgio \ svl \ svt \ svx \ @@ -310,35 +334,13 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ calc \ dbp \ dbu \ - egi \ - eme \ - epb \ - epg \ - epp \ - eps \ - ept \ - era \ - eti \ evoab \ - exp \ filtertracer \ flash \ flat \ graphicfilter \ guesslang \ hyphen \ - icd \ - icg \ - idx \ - ime \ - ipb \ - ipd \ - ips \ - ipt \ - ipx \ - ira \ - itg \ - iti \ jdbc \ kab1 \ kabdrv1 \ @@ -368,7 +370,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ scui \ sd \ sdd \ - sdfilt \ sdui \ simplecm \ sm \ @@ -378,7 +379,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ spell \ sts \ svgfilter \ - svgio \ sw \ tdeab1 \ tdeabdrv1 \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 1b3dd8a6f57e..90b04d4e616c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -347,54 +347,6 @@ File gid_File_Dtd_Toolbar Name = "toolbar.dtd"; End -STD_LIB_FILE( gid_File_Filter_Sdfilt, sdfilt) - -STD_LIB_FILE( git_File_Filter_Svgio, svgio) - -STD_LIB_FILE( gid_File_Filter_Eme, eme) - -STD_LIB_FILE( gid_File_Filter_Icg, icg) - -STD_LIB_FILE( gid_File_Filter_Egi, egi) - -STD_LIB_FILE( gid_File_Filter_Epb, epb) - -STD_LIB_FILE( gid_File_Filter_Epg, epg) - -STD_LIB_FILE( gid_File_Filter_Epp, epp) - -STD_LIB_FILE( gid_File_Filter_Eps, eps) - -STD_LIB_FILE( gid_File_Filter_Ept, ept) - -STD_LIB_FILE( gid_File_Filter_Era, era) - -STD_LIB_FILE( gid_File_Filter_Eti, eti) - -STD_LIB_FILE( gid_File_Filter_Exp, exp) - -STD_LIB_FILE( gid_File_Filter_Icd, icd) - -STD_LIB_FILE( gid_File_Filter_Idx, idx) - -STD_LIB_FILE( gid_File_Filter_Ime, ime) - -STD_LIB_FILE( gid_File_Filter_Ipb, ipb) - -STD_LIB_FILE( gid_File_Filter_Ipd, ipd) - -STD_LIB_FILE( gid_File_Filter_Ips, ips) - -STD_LIB_FILE( gid_File_Filter_Ipt, ipt) - -STD_LIB_FILE( gid_File_Filter_Ipx, ipx) - -STD_LIB_FILE( gid_File_Filter_Ira, ira) - -STD_LIB_FILE( gid_File_Filter_Itg, itg) - -STD_LIB_FILE( gid_File_Filter_Iti, iti) - STD_RES_FILE( gid_File_Res_Eps, eps ) File gid_File_Help_Help_Zip diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index ec90a1318459..43ddeef1b52a 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -157,29 +157,6 @@ Module gid_Module_Root_Files_4 Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root4, auto_File_Lib_ALL - gid_File_Filter_Eme, - gid_File_Filter_Sdfilt, - gid_File_Filter_Icg, - gid_File_Filter_Egi, - gid_File_Filter_Epb, - gid_File_Filter_Epg, - gid_File_Filter_Epp, - gid_File_Filter_Eps, - gid_File_Filter_Ept, - gid_File_Filter_Era, - gid_File_Filter_Eti, - gid_File_Filter_Exp, - gid_File_Filter_Icd, - gid_File_Filter_Idx, - gid_File_Filter_Ime, - gid_File_Filter_Ipb, - gid_File_Filter_Ipd, - gid_File_Filter_Ips, - gid_File_Filter_Ipt, - gid_File_Filter_Ipx, - gid_File_Filter_Ira, - gid_File_Filter_Itg, - gid_File_Filter_Iti, gid_File_Lib_Bib, gid_File_Lib_Flat, gid_File_Lib_J, |