meson: src: build virt-aa-helper 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/security/Makefile.inc.am b/src/security/Makefile.inc.am
index f500d904cde502653705d6c9fa92f866264294df..728131e80c14d49556951aeef01ef2077fb406c6 100644 (file)
--- a/src/security/Makefile.inc.am
+++ b/src/security/Makefile.inc.am
@@ -1,10 +1,5 @@
 # vim: filetype=automake
 
-SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
-       $(DATATYPES_SOURCES) \
-       security/virt-aa-helper.c \
-       $(NULL)
-
 SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \
        security/apparmor/usr.lib.libvirt.virt-aa-helper.in \
        security/apparmor/usr.sbin.libvirtd.in \
@@ -25,32 +20,6 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in
 
 BUILT_SOURCES += $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES)
 
-if WITH_SECDRIVER_APPARMOR
-if WITH_LIBVIRTD
-libexec_PROGRAMS += virt-aa-helper
-
-virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
-
-virt_aa_helper_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       $(NULL)
-virt_aa_helper_LDADD = \
-       libvirt.la \
-       libvirt_driver_storage_impl.la \
-       $(GLIB_LIBS) \
-       $(NULL)
-if WITH_DTRACE_PROBES
-virt_aa_helper_LDADD += libvirt_probes.lo
-endif WITH_DTRACE_PROBES
-virt_aa_helper_CFLAGS = \
-       -I$(srcdir)/conf \
-       -I$(top_srcdir)/src/hypervisor \
-       -I$(srcdir)/security \
-       $(AM_CFLAGS) \
-       $(NULL)
-endif WITH_LIBVIRTD
-endif WITH_SECDRIVER_APPARMOR
-
 if WITH_APPARMOR_PROFILES
 apparmordir = $(sysconfdir)/apparmor.d/
 apparmor_DATA = \

diff --git a/src/security/meson.build b/src/security/meson.build
index 1e85d8dcf5f2b5e065100bb8f2a4a4053540ba07..4014ddccc451cdd7b3c7fe77a874a121b39b4652 100644 (file)
--- a/src/security/meson.build
+++ b/src/security/meson.build
@@ -15,6 +15,10 @@ if conf.has('WITH_SECDRIVER_SELINUX')
   security_driver_sources += 'security_selinux.c'
 endif
 
+apparmor_helper_sources = files(
+  'virt-aa-helper.c',
+)
+
 security_driver_lib = static_library(
   'virt_security_manager',
   [
@@ -31,3 +35,19 @@ security_driver_lib = static_library(
 )
 
 libvirt_libs += security_driver_lib
+
+if conf.has('WITH_LIBVIRTD') and conf.has('WITH_APPARMOR')
+  virt_helpers += {
+    'name': 'virt-aa-helper',
+    'sources': [
+      apparmor_helper_sources,
+      datatypes_sources,
+      dtrace_gen_objects,
+    ],
+    'include': [
+      conf_inc_dir,
+      hypervisor_inc_dir,
+      include_directories('.'),
+    ],
+  }
+endif