diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-10 20:54:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-10 20:54:09 +0100 |
| commit | b64caa8ad85d951c74e1c84096802997340c8e1b (patch) | |
| tree | 8f30b22f3525bc38223be13acbb99b84efa7b62c /Repository.mk | |
| parent | ac0926092831f6968b703c5e999b105ccb0bb4b0 (diff) | |
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.
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index e62f6321b1e3..3d3e35af673b 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) |