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

[Norbert Thiebaud]

 Repository.mk                           |    2 +-
 libreofficekit/Module_libreofficekit.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c68642d535f2ebb7f1cd866ad19b1fd018e7cd6d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 18 15:44:12 2014 -0500

    tilebench depend on linreooficekitgtk so need ENABLE_GTK too
    
    Change-Id: I04b787493115de0190615f42248cc82968907e38

diff --git a/Repository.mk b/Repository.mk
index b521ef6..729c1d3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -85,7 +85,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 ))
 
 $(eval $(call gb_Helper_register_executables,OOO, \
-	$(if $(filter LINUX,$(OS)), tilebench) \
+	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
 	$(call gb_Helper_optional,CRASHREP,crashrep) \
 	gnome-open-url.bin \
 	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
index 716ff48..fe5ee15 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -20,11 +20,11 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\
     Library_libreofficekitgtk \
     Executable_gtktiledviewer \
 ))
-endif # ($(ENABLE_GTK),)
 
 $(eval $(call gb_Module_add_targets,libreofficekit,\
     Executable_tilebench \
 ))
+endif # ($(ENABLE_GTK),)
 
 endif # ($(OS),LINUX)