diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-06-11 19:37:26 -0300 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-13 07:50:32 +0200 |
| commit | 1c2ab8f7871e5b29f5c0025edfdd2ef9e1f795fa (patch) | |
| tree | ee23c07b88cb62b3ef57e801ed128d0a136a8e66 /Repository.mk | |
| parent | 3222f7b9933788a34aaa639dbae05b54e188adba (diff) | |
fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Conflicts:
Repository.mk
Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/Repository.mk b/Repository.mk index 074b2d9e5594..543275e5b1ee 100644 --- a/Repository.mk +++ b/Repository.mk @@ -297,6 +297,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ lng \ lnth \ $(if $(MERGELIBS),merged) \ + migrationoo2 \ + migrationoo3 \ msfilter \ $(if $(DISABLE_SCRIPTING),,msforms) \ mtfrenderer \ @@ -334,12 +336,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(ENABLE_TDEAB),tdeab1) \ $(if $(ENABLE_TDEAB),tdeabdrv1) \ textconversiondlgs \ + textfd \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ ucpexpand1 \ + ucpext \ + ucpcmis1 \ + ucptdoc1 \ unordf \ unoxml \ + updatefeed \ utl \ uui \ $(if $(DISABLE_SCRIPTING),,vbaevents) \ @@ -394,7 +401,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ spa \ spell \ sts \ - textfd \ vclplug_tde \ vclplug_kde \ vclplug_kde4 \ @@ -474,13 +480,22 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ + $(if $(ENABLE_GSTREAMER),avmediagst) \ + $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \ cached1 \ + collator_data \ comphelper \ + dbpool2 \ deployment \ + deploymentgui \ + dict_ja \ + dict_zh \ + embobj \ fileacc \ $(if $(SOLAR_JAVA),hsqldb) \ i18nlangtag \ i18nutil \ + index_data \ localedata_en \ localedata_es \ localedata_euro \ @@ -490,25 +505,25 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(DISABLE_SCRIPTING),,scriptframe) \ sdbc2 \ sofficeapp \ + srtrs1 \ + textconv_dict \ tvhlp1 \ ucb1 \ ucbhelper \ ucpfile1 \ + ucpftp1 \ + ucpchelp1 \ + ucphier1 \ + ucppkg1 \ + unopkgapp \ + xmlsecurity \ + xsec_fw \ xstor \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - avmediagst \ - avmediagst_0_10 \ avmediawin \ bluez_bluetooth \ - collator_data \ - dbpool2 \ - deploymentgui \ - dict_ja \ - dict_zh \ - embobj \ emboleobj \ - index_data \ java_uno_accessbridge \ libreoffice \ macab1 \ @@ -518,16 +533,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pyuno \ pyuno_wrapper \ recentfile \ - srtrs1 \ - textconv_dict \ ucpdav1 \ - ucpftp1 \ - ucpchelp1 \ - ucphier1 \ - ucppkg1 \ - unopkgapp \ - xmlsecurity \ - xsec_fw \ xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ @@ -578,17 +584,11 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cmdmail \ macbe1 \ - migrationoo2 \ - migrationoo3 \ OGLTrans \ pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ - ucpcmis1 \ - ucpext \ - ucptdoc1 \ - updatefeed \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ ) \ |