Merge pull request #17549 from yuwata/tiny-fixes

[thirdparty/systemd.git] / src / machine / meson.build

diff --git a/src/machine/meson.build b/src/machine/meson.build
index 7ea5d9de80d329149ca6bcdcd3b748c9ee390d37..ebbd46d4f25e1b7a2135f18e2bf243edeab3752f 100644 (file)
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -1,19 +1,4 @@
-# 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/>.
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 systemd_machined_sources = files('''
         machined.c
@@ -21,13 +6,16 @@ systemd_machined_sources = files('''
 '''.split())
 
 libmachine_core_sources = files('''
+        image-dbus.c
+        image-dbus.h
+        machine-dbus.c
+        machine-dbus.h
         machine.c
         machine.h
+        machined-core.c
         machined-dbus.c
-        machine-dbus.c
-        machine-dbus.h
-        image-dbus.c
-        image-dbus.h
+        machined-varlink.c
+        machined-varlink.h
         operation.c
         operation.h
 '''.split())
@@ -43,15 +31,8 @@ if conf.get('ENABLE_MACHINED') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.machine1.service',
                      install_dir : dbussystemservicedir)
-
-        i18n.merge_file(
-                'org.freedesktop.machine1.policy',
-                input : 'org.freedesktop.machine1.policy.in',
-                output : 'org.freedesktop.machine1.policy',
-                po_dir : po_dir,
-                data_dirs : po_dir,
-                install : install_polkit,
-                install_dir : polkitpolicydir)
+        install_data('org.freedesktop.machine1.policy',
+                     install_dir : polkitpolicydir)
 endif
 
 tests += [