summaryrefslogtreecommitdiff
path: root/Repository.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-04-15 12:41:49 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-04-15 13:42:36 +0200
commit6078d32763dc4441ce6e4772776a60b3c16688e5 (patch)
tree951480e24fb44d957d7a96d2e79dfd20ef665427 /Repository.mk
parent997d71cdd00e8fafd36b776ab3f0a4806f74e3e8 (diff)
autoinstall more common libraries
Change-Id: I293cca130137f35b6ff29925228284ced3d9b1b7
Diffstat (limited to 'Repository.mk')
-rw-r--r--Repository.mk26
1 files changed, 13 insertions, 13 deletions
diff --git a/Repository.mk b/Repository.mk
index fa771222c794..82f3033a4446 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -560,14 +560,20 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
mtfrenderer \
OGLTrans \
))
+
+$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
+ configmgr \
+ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
+ fsstorage \
+ i18npool \
+ localebe1 \
+))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
PresenterScreen \
basprov \
cairocanvas \
canvasfactory \
cmdmail \
- configmgr \
- desktopbe1 \
directx5canvas \
directx9canvas \
dlgprov \
@@ -575,16 +581,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
fastsax \
fpicker \
fps_office \
- fsstorage \
gconfbe1 \
gdipluscanvas \
hatchwindowfactory \
- i18npool \
i18nsearch \
kdebe1 \
kde4be1 \
ldapbe2 \
- localebe1 \
losessioninstall \
macbe1 \
migrationoo2 \
@@ -615,16 +618,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
$(if $(filter $(OS),MACOSX), \
fps_aqua \
) \
+ $(if $(filter $(OS),WNT), \
+ oleautobridge \
+ smplmail \
+ wininetbe1 \
+ ) \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
- oleautobridge \
- smplmail \
- wininetbe1 \
-))
-endif
-
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
acceptor \
binaryurp \