diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-06-13 11:32:09 -0300 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-15 21:34:50 +0200 |
| commit | 1492a2f09c05a03289e46fbd4e453d1ac03d06f9 (patch) | |
| tree | 36ec2be4be5605974194b47983c3fc2af73caf88 /Repository.mk | |
| parent | 03420d69e2149d2d8b64eeb1ae36411348c9d297 (diff) | |
fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Change-Id: I7a3511172ac8ddd060c51c0339a4b9ff16216668
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Repository.mk b/Repository.mk index 7ee8588628b0..d03394a1bae4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -291,6 +291,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ log \ lng \ lnth \ + $(if $(filter $(OS),MACOSX),macbe1) \ $(if $(MERGELIBS),merged) \ migrationoo2 \ migrationoo3 \ @@ -373,7 +374,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabas \ adabasui \ - ado \ agg \ $(if $(filter $(OS),ANDROID),, \ basebmp \ @@ -382,10 +382,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ oox \ ooxml \ sdbc \ - AppleRemote \ avmediaQuickTime \ filtertracer \ - MacOSXSpell \ mork \ mozab2 \ mozabdrv \ @@ -514,9 +512,20 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ xmlsecurity \ xsec_fw \ xstor \ + $(if $(filter $(OS),WNT), \ + ado \ + $(if $(ENABLE_DIRECTX),avmediawin) \ + $(if $(DISABLE_ATL),,oleautobridge) \ + smplmail \ + wininetbe1 \ + ) \ + $(if $(filter $(OS),MACOSX), \ + AppleRemote \ + fps_aqua \ + MacOSXSpell \ + ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - avmediawin \ bluez_bluetooth \ emboleobj \ java_uno_accessbridge \ @@ -578,20 +587,11 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cmdmail \ - macbe1 \ OGLTrans \ pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ - $(if $(filter $(OS),MACOSX), \ - fps_aqua \ - ) \ - $(if $(filter $(OS),WNT), \ - oleautobridge \ - smplmail \ - wininetbe1 \ - ) \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ |