[Libreoffice-commits] .: 2 commits - Makefile.top postprocess/packcomponents

[David Tardon]

 Makefile.top                           |    2 +-
 postprocess/packcomponents/makefile.mk |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7484f81faf2ee4e6bd80b9200ba48ca013434695
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jul 31 10:22:54 2012 +0200

    fdo#52615 add ADO component to services.rdb again
    
    This was accidentally removed by commit
    d4efa8b0cf48f092d8984f3f085909cd1a6a39af .
    
    Change-Id: Idaa97ea5a141dca7cde6ba4aae51ecb5bf8856d3

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 0ba2f25..e1497aa 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -339,6 +339,7 @@ my_components += \
 
 .IF "$(OS)" == "WNT"
 my_components += \
+    component/connectivity/source/drivers/ado/ado \
     component/dtrans/source/generic/dtrans \
     component/dtrans/util/dnd \
     component/dtrans/util/ftransl \
commit 44eb85bb2089c0d83cbaf621bdaed7b1fe895684
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jul 31 09:27:18 2012 +0200

    accept 'verbose' too
    
    Change-Id: Icd5683ec2609e401e2e04021df5065986875c77c

diff --git a/Makefile.top b/Makefile.top
index 4aaf832..62715de 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -18,7 +18,7 @@ endif
 include $(SRCDIR)/config_$(gb_Side).mk
 
 ifeq ($(GMAKE_OPTIONS),)
-ifeq ($(VERBOSE),)
+ifeq ($(verbose)$(VERBOSE),)
 export GMAKE_OPTIONS:=-rs
 else
 export GMAKE_OPTIONS:=-r