mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrong merge conflict resolution, vcldemo, icontest go to instdir

Browse Source 
Change-Id: Iefcca922fc824877c49a11cd68023d57eff22d2f
This commit is contained in:
Markus Mohrhard
2014-11-10 15:34:10 +01:00
parent e639c4e2a4
commit 726e1a49bd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Repository.mk
View File

@@ -68,9 +68,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
svpclient \ svpclient \
pixelctl ) \ pixelctl ) \
$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
outdevgrind) \
vcldemo \
tiledrendering \ tiledrendering \
$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
)) ))
@@ -150,6 +147,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
senddoc \ senddoc \
) \ ) \
$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
outdevgrind) \
vcldemo \
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)