diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-24 14:39:03 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-24 14:41:16 +0200 |
| commit | ad0f85eb1e839ca21f0a3511cd88b1a62854e5ae (patch) | |
| tree | 874880270e750a0800b5c8190cfe7533b1478856 /Repository.mk | |
| parent | 20696b2a5741fcda3b9cff5fb41da4d2688312c4 (diff) | |
Revert "fdo#60924 autoinstall - gbuild/scp2: still more libs to OOO"
This reverts commit b0c43257d9db19ac45a93d8fb1e7648e82517289.
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/Repository.mk b/Repository.mk index 4d17286353db..95ad515c5013 100644 --- a/Repository.mk +++ b/Repository.mk @@ -274,7 +274,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ icg \ idx \ ime \ - $(if $(filter $(OS)$(COM),WNTMSC),instooofiltmsi) \ ipb \ ipd \ ips \ @@ -307,8 +306,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ pcr \ pdffilter \ $(if $(DISABLE_SCRIPTING),,protocolhandler) \ - $(if $(filter $(OS)$(COM),WNTMSC),qslnkmsi) \ - $(if $(filter $(OS)$(COM),WNTMSC),reg4allmsdoc) \ res \ sax \ sb \ @@ -317,13 +314,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ sd \ sdd \ sdfilt \ - $(if $(filter $(OS)$(COM),WNTMSC),sdqsmsi) \ sdui \ - $(if $(filter $(OS)$(COM),WNTMSC),sellangmsi) \ sfx \ simplecanvas \ slideshow \ - $(if $(filter $(OS)$(COM),WNTMSC),sn_tools) \ sot \ $(if $(ENABLE_HEADLESS),,spl) \ $(if $(DISABLE_SCRIPTING),,stringresource) \ @@ -364,24 +358,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ xsltfilter \ $(if $(filter $(OS),WNT), \ ado \ - 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 \ - ) \ + $(if $(DISABLE_ATL),,oleautobridge) \ smplmail \ wininetbe1 \ - xmlsec1 \ ) \ $(if $(filter $(OS),MACOSX), \ AppleRemote \ @@ -549,6 +528,7 @@ $(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 \ @@ -569,17 +549,28 @@ $(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 \ @@ -622,6 +613,7 @@ $(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) |