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

meson: src: build virtproxyd 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/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index f6669bd25f..2007bdf865 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -62,8 +62,6 @@ OPENRC_CONF_FILES += \
 
 if WITH_LIBVIRTD
 
-sbin_PROGRAMS += virtproxyd
-
 augeas_DATA += \
 	remote/libvirtd.aug \
 	remote/virtproxyd.aug \
@@ -79,18 +77,6 @@ nodist_conf_DATA += \
 	remote/virtproxyd.conf \
 	$(NULL)
 
-virtproxyd_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtproxyd_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtproxyd_CFLAGS = \
-	$(REMOTE_DAEMON_CFLAGS) \
-	-DSOCK_PREFIX="\"libvirt\"" \
-	-DDAEMON_NAME="\"virtproxyd\"" \
-	-DWITH_IP \
-	-DVIRTPROXYD \
-	$(NULL)
-virtproxyd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtproxyd_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 remote/libvirtd.conf: remote/libvirtd.conf.in
 	$(AM_V_GEN)$(SED) \
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 8cb53b2c78..ee38364868 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -93,6 +93,16 @@ if conf.has('WITH_REMOTE')
         '-DLIBVIRTD',
       ],
     }
+
+    virt_daemons += {
+      'name': 'virtproxyd',
+      'c_args': [
+        '-DSOCK_PREFIX="libvirt"',
+        '-DDAEMON_NAME="virtproxyd"',
+        '-DWITH_IP',
+        '-DVIRTPROXYD',
+      ],
+    }
   endif
 endif