diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-10-03 21:48:28 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-10-06 11:37:18 +0200 |
| commit | 783e3552c092fd7bb74f1f39c6f89ddc097e15cc (patch) | |
| tree | 35c8d0c721bb800db5845400dd68e23fe94f81d1 /Makefile.am | |
| parent | loleaflet: l10n update from Pootle (diff) | |
| download | online-783e3552c092fd7bb74f1f39c6f89ddc097e15cc.tar.gz online-783e3552c092fd7bb74f1f39c6f89ddc097e15cc.zip | |
Support key logic in loolws + improvements in loolconfig.
To be able to set the support key directly from the command line, and to show
the option, etc.
Change-Id: Iac93bc47a6f4b9d5a5ad0ac8b06bda978e01b760
Reviewed-on: https://gerrit.libreoffice.org/43098
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 0d2d4884b9..7f8d0ca056 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,8 @@ if ENABLE_SSL shared_sources += net/Ssl.cpp endif -loolwsd_sources = wsd/Admin.cpp \ +loolwsd_sources = common/Crypto.cpp \ + wsd/Admin.cpp \ wsd/AdminModel.cpp \ wsd/Auth.cpp \ wsd/DocumentBroker.cpp \ @@ -152,6 +153,7 @@ wsd_headers = wsd/Admin.hpp \ wsd/UserMessages.hpp shared_headers = common/Common.hpp \ + common/Crypto.hpp \ common/IoUtil.hpp \ common/FileUtil.hpp \ common/Log.hpp \ |