diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-12 06:06:36 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-12 06:06:36 +0100 |
| commit | bf9435bce063da95deb8a52371bce04e7435c966 (patch) | |
| tree | 5321aeed1d7c1c402497f522d4224cf1aac523e0 /Repository.mk | |
| parent | add quick way to enable OpenGL backend through env var (diff) | |
| download | core-bf9435bce063da95deb8a52371bce04e7435c966.tar.gz core-bf9435bce063da95deb8a52371bce04e7435c966.zip | |
Revert "Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir"""
This reverts commit 80c83f4a578e1ec0c8b5e439687716e365937c9a.
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) |