diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-08-21 11:55:18 -0300 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-08-22 16:16:52 +0000 |
| commit | 3f8c36caef76ee1f688d35d39ac5bffe5d0f8319 (patch) | |
| tree | 62cc52e74f4eb55927a3008441107ec1eb8de437 /Repository.mk | |
| parent | 91ffdf58555ea25c5ffdaee9ec741ea99370096a (diff) | |
fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66
Reviewed-on: https://gerrit.libreoffice.org/5571
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Repository.mk b/Repository.mk index 1433f1b79c70..43ee14308ff2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -359,7 +359,21 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ xsltfilter \ $(if $(filter $(OS),WNT), \ ado \ - $(if $(DISABLE_ATL),,oleautobridge) \ + dnd \ + dtrans \ + fps \ + ftransl \ + $(if $(ENABLE_JAVA),java_uno_accessbridge) \ + $(if $(DISABLE_ATL),,oleautobridge \ + inprocserv \ + ) \ + $(if $(WINDOWS_SDK_HOME),instooofiltmsi \ + qslnkmsi \ + reg4allmsdoc \ + sdqsmsi \ + sellangmsi \ + sn_tools \ + ) \ smplmail \ wininetbe1 \ ) \ @@ -530,7 +544,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ bluez_bluetooth \ emboleobj \ - java_uno_accessbridge \ libreoffice \ macab1 \ macabdrv1 \ @@ -551,28 +564,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - dnd \ - dtrans \ fop \ - fps \ - ftransl \ - inprocserv \ - instooofiltmsi \ jfregca \ ooofilt \ ooofilt_x64 \ propertyhdl \ propertyhdl_x64 \ - qslnkmsi \ - reg4allmsdoc \ regactivex \ regpatchactivex \ - sdqsmsi \ - sellangmsi \ shlxthdl \ shlxthdl_x64 \ shlxtmsi \ - sn_tools \ so_activex \ so_activex_x64 \ sysdtrans \ |