Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3682

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3682/1

fdo#60949: Remove last UNOLIBS_OOO

Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f
---
M Repository.mk
1 file changed, 8 insertions(+), 11 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 296ffc8..76d6662 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -225,6 +225,7 @@
     chartcore \
     chartcontroller \
     cppcanvas \
+    configmgr \
     ctl \
     cui \
     dba \
@@ -232,8 +233,9 @@
     dbmm \
     $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
     dbaxml \
-       deploymentmisc \
-       $(if $(filter unx,$(GUIBASE)),desktop_detector) \
+    deploymentmisc \
+    $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
+    $(if $(filter unx,$(GUIBASE)),desktop_detector) \
     drawinglayer \
     editeng \
     egi \
@@ -252,12 +254,14 @@
     for \
     forui \
     frm \
+    fsstorage \
     fwe \
        fwi \
     fwk \
     fwl \
        fwm \
     $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
+    i18npool \
     icd \
     icg \
     idx \
@@ -270,6 +274,7 @@
     ira \
     itg \
     iti \
+    localebe1 \
     lng \
     $(if $(MERGELIBS),merged) \
     msfilter \
@@ -289,6 +294,7 @@
     tk \
     tl \
        $(if $(ENABLE_TELEPATHY),tubes) \
+    ucpexpand1 \
     unordf \
     unoxml \
     utl \
@@ -632,15 +638,6 @@
         smplmail \
         wininetbe1 \
     ) \
-))
-
-$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
-       configmgr \
-       $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
-       fsstorage \
-       i18npool \
-       localebe1 \
-       ucpexpand1 \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \

-- 
To view, visit https://gerrit.libreoffice.org/3682
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.