diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-07-22 20:45:05 -0300 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-23 23:20:40 +0000 |
| commit | b0c43257d9db19ac45a93d8fb1e7648e82517289 (patch) | |
| tree | a6ab89e80010fa429fc211a682380e8a31712ff9 /Repository.mk | |
| parent | 75ef95ebc48517d228d369167f89424a72b320bf (diff) | |
fdo#60924 autoinstall - gbuild/scp2: still more libs to OOO
Change-Id: I89a661908fe7d679aa68d5ba9ead41d6b0a0d6bf
Reviewed-on: https://gerrit.libreoffice.org/5039
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Repository.mk b/Repository.mk index 95ad515c5013..cf98c411bb5c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -358,9 +358,24 @@ $(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 $(SOLAR_JAVA),java_uno_accessbridge) \ + $(if $(DISABLE_ATL),,oleautobridge \ + inprocserv \ + ) \ + $(if $(HAVE_WINDOWS_SDK),instooofiltmsi \ + qslnkmsi \ + reg4allmsdoc \ + sdqsmsi \ + sellangmsi \ + sn_tools \ + ) \ smplmail \ wininetbe1 \ + xmlsec1 \ ) \ $(if $(filter $(OS),MACOSX), \ AppleRemote \ @@ -528,7 +543,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 \ @@ -549,28 +563,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 \ @@ -613,7 +616,6 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - xmlsec1 \ xmlsec1-nss \ )) ifneq ($(CROSS_COMPILING),YES) |