diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-07 10:44:43 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-07 12:34:12 +0100 |
| commit | e821f6a916c19f148435038be21faeb49beac68c (patch) | |
| tree | 929431d2ea4472ae67c77130bec689da554b3be3 | |
| parent | 43a29e2b65e13500a2ce60ed41d2f57ba3bc22ad (diff) | |
| download | systemd-e821f6a916c19f148435038be21faeb49beac68c.tar.gz | |
meson: place systemd-sulogin-shell in build/
We do that will all executables so that it's easy to call them.
| -rw-r--r-- | meson.build | 10 | ||||
| -rw-r--r-- | src/sulogin-shell/meson.build | 25 |
2 files changed, 9 insertions, 26 deletions
diff --git a/meson.build b/meson.build index 3bdd87fc6b..c0b36a98f2 100644 --- a/meson.build +++ b/meson.build @@ -1292,7 +1292,6 @@ subdir('src/resolve') subdir('src/timedate') subdir('src/timesync') subdir('src/vconsole') -subdir('src/sulogin-shell') subdir('src/boot/efi') subdir('src/test') @@ -2370,6 +2369,15 @@ if conf.get('ENABLE_NETWORKD') == 1 install_dir : rootbindir) public_programs += [exe] endif + +executable('systemd-sulogin-shell', + ['src/sulogin-shell/sulogin-shell.c'], + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + ############################################################ foreach tuple : tests diff --git a/src/sulogin-shell/meson.build b/src/sulogin-shell/meson.build deleted file mode 100644 index 1617258b79..0000000000 --- a/src/sulogin-shell/meson.build +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1+ -# -# Copyright 2017 Zbigniew Jędrzejewski-Szmek -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see <http://www.gnu.org/licenses/>. - -executable('systemd-sulogin-shell', - ['sulogin-shell.c'], - include_directories : includes, - link_with : [libshared], - dependencies : [], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) |