[Libreoffice-commits] core.git: Repository.mk

[Markus Mohrhard]

 Repository.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bf9435bce063da95deb8a52371bce04e7435c966
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Nov 12 06:06:36 2014 +0100

    Revert "Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir"""
    
    This reverts commit 80c83f4a578e1ec0c8b5e439687716e365937c9a.

diff --git a/Repository.mk b/Repository.mk
index e62f632..3d3e35a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -68,6 +68,9 @@ $(eval $(call gb_Helper_register_executables,NONE, \
         svpclient \
         pixelctl ) \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
+	$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
+	    outdevgrind) \
+	vcldemo \
 	tiledrendering \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
 ))
@@ -147,9 +150,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	$(if $(filter WNT,$(OS)), \
 		senddoc \
 	) \
-	$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
-	    outdevgrind) \
-	vcldemo \
 ))
 
 ifeq ($(OS),WNT)