]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
meson: src: build virtlxcd daemon binary
authorPavel Hrdina <phrdina@redhat.com>
Mon, 22 Jun 2020 14:45:10 +0000 (16:45 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Mon, 3 Aug 2020 07:27:05 +0000 (09:27 +0200)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
src/lxc/Makefile.inc.am
src/lxc/meson.build

index b098b9753265af87f241b4956f9fe38072e3acab..fc98be76fa7cbe88557a804960ec5e0ccd9fce34 100644 (file)
@@ -48,22 +48,10 @@ BUILT_SOURCES += $(LXC_GENERATED)
 
 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 += \
index 5d8a20bd9f7cef0cb0b4590f9e043afb64f21630..a90083cdc3d0e4f76d553bb1ebc9a47a8e3f67d8 100644 (file)
@@ -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