diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 22:11:00 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:48 +0100 |
| commit | 7c898c933cb5c4baa7315bb5547a1b53cb12ea61 (patch) | |
| tree | 0022d8dea8ccb320374ffe0a44a960ee7d4fbaed /Repository.mk | |
| parent | 0183dc88e25b30725c118fd5b515e739d717b6be (diff) | |
scp2: move brand executables to AutoInstall
... except for soffice.exe which is referenced by some FolderItem.
Change-Id: Ie5788aa950f0b8526220fb2c8b9281ce934b8a5d
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 551a95c6ea17..bf32244e4db9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -80,6 +80,17 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ $(if $(filter ODK,$(BUILD_TYPE)),uno-skeletonmaker) \ )) +$(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ + $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ + soffice_bin \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ + $(if $(filter WNT,$(OS)), \ + unoinfo \ + unopkg \ + unopkg_com \ + ) \ +)) + $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ gengal \ )) @@ -94,9 +105,7 @@ endif $(eval $(call gb_Helper_register_executables,OOO, \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \ gnome-open-url.bin \ - $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ $(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \ - soffice_bin \ $(if $(filter $(GUIBASE)$(ENABLE_GTK),unxTRUE), \ xid-fullscreen-on-all-monitors \ ) \ @@ -110,7 +119,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ vcldemo \ tiledrendering \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ xpdfimport \ $(if $(filter WNT,$(OS)), \ odbcconfig \ @@ -125,9 +133,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ smath \ sweb \ swriter \ - unoinfo \ - unopkg \ - unopkg_com \ ) \ )) |