mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
meson: convert authz directory to Meson
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
de59dda32d
commit
5e7fbd2515
6 changed files with 27 additions and 10 deletions
1
Makefile
1
Makefile
|
@ -241,7 +241,6 @@ include $(SRC_PATH)/Makefile.objs
|
|||
endif
|
||||
|
||||
dummy := $(call unnest-vars,, \
|
||||
authz-obj-y \
|
||||
chardev-obj-y \
|
||||
block-obj-y \
|
||||
block-obj-m \
|
||||
|
|
|
@ -9,7 +9,8 @@ ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
|
|||
|
||||
chardev-obj-y = chardev/
|
||||
|
||||
authz-obj-y = authz/
|
||||
authz-obj-y = authz/libauthz.fa
|
||||
authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam)
|
||||
|
||||
block-obj-y = block/ nbd/ scsi/
|
||||
block-obj-y += block.o blockjob.o job.o
|
||||
|
|
|
@ -192,9 +192,9 @@ common-obj-m :=
|
|||
|
||||
include $(SRC_PATH)/Makefile.objs
|
||||
dummy := $(call fix-paths,../,, \
|
||||
authz-obj-y \
|
||||
qom-obj-y)
|
||||
dummy := $(call unnest-vars,.., \
|
||||
authz-obj-y \
|
||||
block-obj-y \
|
||||
block-obj-m \
|
||||
chardev-obj-y \
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
authz-obj-y += base.o
|
||||
authz-obj-y += simple.o
|
||||
authz-obj-y += list.o
|
||||
authz-obj-y += listfile.o
|
||||
authz-obj-$(CONFIG_AUTH_PAM) += pamacct.o
|
||||
|
||||
pamacct.o-libs = -lpam
|
19
authz/meson.build
Normal file
19
authz/meson.build
Normal file
|
@ -0,0 +1,19 @@
|
|||
authz_ss = ss.source_set()
|
||||
authz_ss.add(genh)
|
||||
authz_ss.add(files(
|
||||
'base.c',
|
||||
'list.c',
|
||||
'listfile.c',
|
||||
'simple.c',
|
||||
))
|
||||
|
||||
authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c'))
|
||||
|
||||
authz_ss = authz_ss.apply(config_host, strict: false)
|
||||
libauthz = static_library('authz', authz_ss.sources() + genh,
|
||||
dependencies: [authz_ss.dependencies()],
|
||||
name_suffix: 'fa',
|
||||
build_by_default: false)
|
||||
|
||||
authz = declare_dependency(link_whole: libauthz,
|
||||
dependencies: qom)
|
|
@ -103,6 +103,10 @@ if 'CONFIG_GNUTLS' in config_host
|
|||
endif
|
||||
pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(),
|
||||
link_args: config_host['PIXMAN_LIBS'].split())
|
||||
pam = not_found
|
||||
if 'CONFIG_AUTH_PAM' in config_host
|
||||
pam = cc.find_library('pam')
|
||||
endif
|
||||
libattr = not_found
|
||||
if 'CONFIG_ATTR' in config_host
|
||||
libattr = declare_dependency(link_args: config_host['LIBATTR_LIBS'].split())
|
||||
|
@ -341,6 +345,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
|
|||
sources: genh + version_res)
|
||||
|
||||
subdir('qom')
|
||||
subdir('authz')
|
||||
subdir('fsdev')
|
||||
|
||||
# Other build targets
|
||||
|
|
Loading…
Reference in a new issue