]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
meson: src: build virtinterfaced daemon binary
authorPavel Hrdina <phrdina@redhat.com>
Mon, 22 Jun 2020 14:32:48 +0000 (16:32 +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/interface/Makefile.inc.am
src/interface/meson.build

index 9a56e0b4e0f51e3499a6338ae73060406143d958..7d1d8ed2c4c012644e91cd6d5a0d2b35caa3a116 100644 (file)
@@ -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 += \
index bb08706f21c9c492fdf3df797320f9d1d786974b..dbf1d7ff606a018e86c3c2122d9ff49692661c4a 100644 (file)
@@ -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