Repository.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b64caa8ad85d951c74e1c84096802997340c8e1b
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Nov 10 20:54:09 2014 +0100
Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir"
This reverts commit 726e1a49bd40d98ffcfba760a08c503b096c79bd.
It is not desirable to put vcldemo and icontest into installation sets.
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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
