From c2fad2eb31ce018b3f428440e6dbbe9456448c07 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 22 Jun 2020 16:49:05 +0200 Subject: [PATCH] meson: src: build virtnwfilterd daemon binary Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- src/nwfilter/Makefile.inc.am | 12 ------------ src/nwfilter/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index d853282b70..eb5cade5b9 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -11,22 +11,10 @@ if WITH_NWFILTER nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter nwfilterxml_DATA = $(NWFILTER_XML_FILES) -sbin_PROGRAMS += virtnwfilterd - nodist_conf_DATA += nwfilter/virtnwfilterd.conf augeas_DATA += nwfilter/virtnwfilterd.aug augeastest_DATA += nwfilter/test_virtnwfilterd.aug -virtnwfilterd_SOURCES = $(REMOTE_DAEMON_SOURCES) -nodist_virtnwfilterd_SOURCES = $(REMOTE_DAEMON_GENERATED) -virtnwfilterd_CFLAGS = \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME="\"virtnwfilterd\"" \ - -DMODULE_NAME="\"nwfilter\"" \ - $(NULL) -virtnwfilterd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS) -virtnwfilterd_LDADD = $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES += nwfilter/virtnwfilterd.sysconf SYSTEMD_UNIT_FILES += \ diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 8da853c3ec..b8f94c726c 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -33,4 +33,12 @@ if conf.has('WITH_NWFILTER') libvirt_no_undefined, ], } + + virt_daemons += { + 'name': 'virtnwfilterd', + 'c_args': [ + '-DDAEMON_NAME="virtnwfilterd"', + '-DMODULE_NAME="nwfilter"', + ], + } endif