[libvirt PATCH 204/351] meson: src: build virtnetworkd daemon binary

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
 src/network/Makefile.inc.am | 12 ------------
 src/network/meson.build     |  8 ++++++++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 523ae453797..c0c8180674d 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -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 += \
diff --git a/src/network/meson.build b/src/network/meson.build
index 879a5731a6e..d244d2f522b 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -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
-- 
2.26.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux