From f77b7c270d390ce54455241b9cbfef967973662c Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 22 Jun 2020 16:53:51 +0200 Subject: [PATCH] meson: src: build virtproxyd daemon binary Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- src/remote/Makefile.inc.am | 14 -------------- src/remote/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 14 deletions(-) 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