[Libreoffice-commits] core.git: libreofficekit/Module_libreofficekit.mk

[Matúš Kukan]

 libreofficekit/Module_libreofficekit.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4e9d8ca44a246653894559f10bf88effba366b10
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Jul 15 21:54:58 2014 +0200

    libreofficekit does not work with libmerged
    
    Change-Id: I3ca4cf51f6d3999a0f701f108a7c5c21329eb1c7

diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
index 2d9b98c..4c5163f 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -15,9 +15,11 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\
     StaticLibrary_libreofficekit \
 ))
 
+ifeq ($(MERGELIBS),)
 $(eval $(call gb_Module_add_check_targets,libreofficekit,\
     CppunitTest_libreofficekit_tiledrendering \
 ))
+endif
 
 ifneq ($(ENABLE_GTK),)
 $(eval $(call gb_Module_add_targets,libreofficekit,\