[Libreoffice-commits] .: connectivity/source

[Petr Mladek]

 connectivity/source/drivers/evoab/makefile.mk |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 4949f4994d2792f9fc70baf39b2cb5ab890dcdbf
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 19:55:22 2011 +0200

    buildfix-evo1-vs-evo2.diff: Evo address books conflics (bnc#496902, i#101439)
    
    build either the driver for Evolution 1.x or 2.x; they produce the same binary
    and configuration, so they can't be built at once; Evolution 1.x address book
    is obsolete anyway

diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 82e0ce4..4c9357b 100755
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
@@ -32,6 +32,11 @@ TARGET=evoab
 
 VISIBILITY_HIDDEN=TRUE
 
+.IF "$(ENABLE_EVOAB2)"=="TRUE"
+dummy:
+    @echo "Evolution 1.x Addressbook build disabled in favour of Evolution 2.x Addressbook"
+.ELSE
+
 # --- Settings ----------------------------------
 
 .IF "$(DBGUTIL_OJ)"!=""
@@ -101,6 +106,7 @@ DEF1NAME=	$(SHL1TARGET)
 dummy:
     @echo "Nothing to build for GUI $(GUI)"
 .ENDIF
+.ENDIF
 
 # --- Targets ----------------------------------