Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- src/Makefile.am | 1 - src/vz/Makefile.inc.am | 12 ------------ src/vz/meson.build | 8 ++++++++ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ec6da9a6ff5..6a8a7ea1791 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,7 +43,6 @@ OPENRC_INIT_FILES = OPENRC_INIT_FILES_IN = OPENRC_CONF_FILES = SYSCONF_FILES = -sbin_PROGRAMS = bin_PROGRAMS = COMMON_UNIT_VARS = \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index f55d03d400a..18bb0c40c46 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -5,22 +5,10 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) if WITH_VZ -sbin_PROGRAMS += virtvzd - nodist_conf_DATA += vz/virtvzd.conf augeas_DATA += vz/virtvzd.aug augeastest_DATA += vz/test_virtvzd.aug -virtvzd_SOURCES = $(REMOTE_DAEMON_SOURCES) -nodist_virtvzd_SOURCES = $(REMOTE_DAEMON_GENERATED) -virtvzd_CFLAGS = \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME="\"virtvzd\"" \ - -DMODULE_NAME="\"vz\"" \ - $(NULL) -virtvzd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS) -virtvzd_LDADD = $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES += vz/virtvzd.sysconf SYSTEMD_UNIT_FILES += \ diff --git a/src/vz/meson.build b/src/vz/meson.build index 41cce92de2f..07ad8fc75ae 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -30,4 +30,12 @@ if conf.has('WITH_VZ') libvirt_no_undefined, ], } + + virt_daemons += { + 'name': 'virtvzd', + 'c_args': [ + '-DDAEMON_NAME="virtvzd"', + '-DMODULE_NAME="vz"', + ], + } endif -- 2.26.2