From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 22 Jun 2020 14:45:10 +0000 (+0200)
Subject: meson: src: build virtlxcd daemon binary
X-Git-Tag: v6.7.0-rc1~400
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39630772dc7fd54172fce44b51cb2bdce664dd9b;p=thirdparty%2Flibvirt.git

meson: src: build virtlxcd daemon binary

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
---

diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index b098b97532..fc98be76fa 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -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 += \
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 5d8a20bd9f..a90083cdc3 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