diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-30 22:43:27 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-31 17:53:52 +0100 |
| commit | 58735f060804248089c0919c67485ae78c462c36 (patch) | |
| tree | 9b73e195fabb5e3879516fcac5a63ad0e66f2ac9 /Repository.mk | |
| parent | 6c778e0a9b80734becb52fe3d0799754393c4bc4 (diff) | |
scp2: move unix/gnome executables to AutoInstall
Change-Id: I0e0c3b5e3f130093f430f47c1730580105718c1e
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/Repository.mk b/Repository.mk index 7ca98ff3892f..b09482857655 100644 --- a/Repository.mk +++ b/Repository.mk @@ -137,6 +137,10 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ gengal \ + $(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \ + $(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \ + $(if $(filter unx,$(GUIBASE)),uri-encode) \ + ui-previewer \ )) ifneq ($(ENABLE_CRASHDUMP),) @@ -152,6 +156,15 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,python, \ ) \ )) +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Helper_register_executables_for_install,OOO,gnome, \ + gnome-open-url.bin \ + $(if $(ENABLE_GTK),\ + xid-fullscreen-on-all-monitors \ + ) \ +)) +endif + ifneq ($(ENABLE_PDFIMPORT),) $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \ xpdfimport \ @@ -160,16 +173,6 @@ endif $(eval $(call gb_Helper_register_executables,OOO, \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \ - gnome-open-url.bin \ - $(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \ - $(if $(filter $(GUIBASE)$(ENABLE_GTK),unxTRUE), \ - xid-fullscreen-on-all-monitors \ - ) \ - $(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \ - tdefilepicker \ - ) \ - uri-encode \ - ui-previewer \ $(if $(filter LINUX MACOSX WNT,$(OS)), \ icontest) \ vcldemo \ |