From 98fb5f98d84474103a04cbad824febecb25407c2 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Wed, 16 Jul 2014 08:15:30 +0200
Subject: Revert "libreofficekit does not work with libmerged"

Instead, we need to make sure it works with libmerged too :-)

This reverts commit 4e9d8ca44a246653894559f10bf88effba366b10.
---
 libreofficekit/Module_libreofficekit.mk | 2 --
 1 file changed, 2 deletions(-)

(limited to 'libreofficekit')

diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
index 4c5163f03221..2d9b98cc4762 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -15,11 +15,9 @@ $(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,\
-- 
cgit