diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-15 21:54:58 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-15 21:59:17 +0200 |
| commit | 4e9d8ca44a246653894559f10bf88effba366b10 (patch) | |
| tree | a185b4673b2d46a0041f23293d4dc4a4ee88c835 | |
| parent | 7a8fcfca98ee10666c58011ebe0a5f96e008d22d (diff) | |
libreofficekit does not work with libmerged
Change-Id: I3ca4cf51f6d3999a0f701f108a7c5c21329eb1c7
| -rw-r--r-- | libreofficekit/Module_libreofficekit.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk index 2d9b98cc4762..4c5163f03221 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,\ |