diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-07-16 08:15:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-07-16 19:37:36 +0200 |
| commit | 98fb5f98d84474103a04cbad824febecb25407c2 (patch) | |
| tree | bb1c1602760b3797d60cc318456f61cf76c2b621 /libreofficekit | |
| parent | 385852e9add39081f8e915bd88ad8560630762a2 (diff) | |
Revert "libreofficekit does not work with libmerged"
Instead, we need to make sure it works with libmerged too :-)
This reverts commit 4e9d8ca44a246653894559f10bf88effba366b10.
Diffstat (limited to 'libreofficekit')
| -rw-r--r-- | libreofficekit/Module_libreofficekit.mk | 2 |
1 files changed, 0 insertions, 2 deletions
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,\ |