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

index 523ae453797a01488a454bc6075317d2c5b0467d..c0c8180674dbe56ad5f328aabf36ea65df0696eb 100644 (file)
@@ -10,22 +10,10 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 
 
 if WITH_NETWORK
-sbin_PROGRAMS += virtnetworkd
-
 nodist_conf_DATA += network/virtnetworkd.conf
 augeas_DATA += network/virtnetworkd.aug
 augeastest_DATA += network/test_virtnetworkd.aug
 
-virtnetworkd_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtnetworkd_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtnetworkd_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtnetworkd\"" \
-       -DMODULE_NAME="\"network\"" \
-       $(NULL)
-virtnetworkd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtnetworkd_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 SYSCONF_FILES += network/virtnetworkd.sysconf
 
 SYSTEMD_UNIT_FILES += \
index 879a5731a6e6eca20bd82d204cd1179f7e28fe4c..d244d2f522bc445817a69cbf437c3399fe00883f 100644 (file)
@@ -33,4 +33,12 @@ if conf.has('WITH_NETWORK')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtnetworkd',
+    'c_args': [
+      '-DDAEMON_NAME="virtnetworkd"',
+      '-DMODULE_NAME="network"',
+    ],
+  }
 endif