[libvirt PATCH 199/351] meson: src: build virtinterfaced daemon binary

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


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

diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 9a56e0b4e0f..7d1d8ed2c4c 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -5,22 +5,11 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES))
 
 if WITH_INTERFACE
-sbin_PROGRAMS += virtinterfaced
 
 nodist_conf_DATA += interface/virtinterfaced.conf
 augeas_DATA += interface/virtinterfaced.aug
 augeastest_DATA += interface/test_virtinterfaced.aug
 
-virtinterfaced_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtinterfaced_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtinterfaced_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtinterfaced\"" \
-       -DMODULE_NAME="\"interface\"" \
-       $(NULL)
-virtinterfaced_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtinterfaced_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 SYSCONF_FILES += interface/virtinterfaced.sysconf
 
 SYSTEMD_UNIT_FILES += \
diff --git a/src/interface/meson.build b/src/interface/meson.build
index bb08706f21c..dbf1d7ff606 100644
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -26,4 +26,12 @@ if conf.has('WITH_INTERFACE')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtinterfaced',
+    'c_args': [
+      '-DDAEMON_NAME="virtinterfaced"',
+      '-DMODULE_NAME="interface"',
+    ],
+  }
 endif
-- 
2.26.2




More information about the libvir-list mailing list