Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- src/Makefile.am | 12 ------------ src/meson.build | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7d0e7b2e96c..4eed047926d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,18 +105,6 @@ include storage/Makefile.inc.am include remote/Makefile.inc.am -SECDRIVER_CFLAGS = -SECDRIVER_LIBS = -if WITH_SECDRIVER_SELINUX -SECDRIVER_CFLAGS += $(SELINUX_CFLAGS) -SECDRIVER_LIBS += $(SELINUX_LIBS) -endif WITH_SECDRIVER_SELINUX -if WITH_SECDRIVER_APPARMOR -SECDRIVER_CFLAGS += $(APPARMOR_CFLAGS) -SECDRIVER_LIBS += $(APPARMOR_LIBS) -endif WITH_SECDRIVER_APPARMOR - - moddir = $(libdir)/libvirt/connection-driver confdir = $(sysconfdir)/libvirt diff --git a/src/meson.build b/src/meson.build index 0f5b83744fd..453691dc902 100644 --- a/src/meson.build +++ b/src/meson.build @@ -17,3 +17,14 @@ src_dep = declare_dependency( ], link_args: libvirt_relro + libvirt_no_indirect + coverage_flags + driver_modules_flags + win32_link_flags, ) + + +# define secdriver_dep + +secdriver_dep = [] +if conf.has('WITH_SECDRIVER_SELINUX') + secdriver_dep += selinux_dep +endif +if conf.has('WITH_SECDRIVER_APPARMOR') + secdriver_dep += apparmor_dep +endif -- 2.26.2