[libvirt PATCH 203/351] meson: src: build virtlxcd daemon binary

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:57:19 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/lxc/Makefile.inc.am | 12 ------------
 src/lxc/meson.build     |  8 ++++++++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 3bf8d9dfb05..19546181e51 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -47,22 +47,10 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 
 if WITH_LXC
 
-sbin_PROGRAMS += virtlxcd
-
 nodist_conf_DATA += lxc/virtlxcd.conf
 augeas_DATA += lxc/virtlxcd.aug
 augeastest_DATA += lxc/test_virtlxcd.aug
 
-virtlxcd_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtlxcd_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtlxcd_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtlxcd\"" \
-       -DMODULE_NAME="\"lxc\"" \
-       $(NULL)
-virtlxcd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtlxcd_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 SYSCONF_FILES += lxc/virtlxcd.sysconf
 
 SYSTEMD_UNIT_FILES += \
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 5d8a20bd9f7..a90083cdc3d 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -74,4 +74,12 @@ if conf.has('WITH_LXC')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtlxcd',
+    'c_args': [
+      '-DDAEMON_NAME="virtlxcd"',
+      '-DMODULE_NAME="lxc"',
+    ],
+  }
 endif
-- 
2.26.2




More information about the libvir-list mailing list