mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-22 02:44:53 +00:00
meson: convert chardev directory to Meson (tools part)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
3154fee4db
commit
848e8ff677
1
Makefile
1
Makefile
|
@ -182,7 +182,6 @@ include $(SRC_PATH)/Makefile.objs
|
||||||
endif
|
endif
|
||||||
|
|
||||||
dummy := $(call unnest-vars,, \
|
dummy := $(call unnest-vars,, \
|
||||||
chardev-obj-y \
|
|
||||||
block-obj-y \
|
block-obj-y \
|
||||||
block-obj-m \
|
block-obj-m \
|
||||||
storage-daemon-obj-y \
|
storage-daemon-obj-y \
|
||||||
|
|
|
@ -7,8 +7,6 @@ qom-obj-y = qom/libqom.fa
|
||||||
|
|
||||||
ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
|
ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
|
||||||
|
|
||||||
chardev-obj-y = chardev/
|
|
||||||
|
|
||||||
authz-obj-y = authz/libauthz.fa
|
authz-obj-y = authz/libauthz.fa
|
||||||
authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam)
|
authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam)
|
||||||
|
|
||||||
|
@ -19,6 +17,8 @@ block-obj-$(CONFIG_REPLICATION) += replication.o
|
||||||
|
|
||||||
block-obj-m = block/
|
block-obj-m = block/
|
||||||
|
|
||||||
|
chardev-obj-y = chardev/libchardev.fa
|
||||||
|
|
||||||
crypto-obj-y = crypto/libcrypto.fa
|
crypto-obj-y = crypto/libcrypto.fa
|
||||||
|
|
||||||
io-obj-y = io/libio.fa
|
io-obj-y = io/libio.fa
|
||||||
|
|
|
@ -199,13 +199,13 @@ common-obj-m :=
|
||||||
include $(SRC_PATH)/Makefile.objs
|
include $(SRC_PATH)/Makefile.objs
|
||||||
dummy := $(call fix-paths,../,, \
|
dummy := $(call fix-paths,../,, \
|
||||||
authz-obj-y \
|
authz-obj-y \
|
||||||
|
chardev-obj-y \
|
||||||
crypto-obj-y \
|
crypto-obj-y \
|
||||||
io-obj-y \
|
io-obj-y \
|
||||||
qom-obj-y)
|
qom-obj-y)
|
||||||
dummy := $(call unnest-vars,.., \
|
dummy := $(call unnest-vars,.., \
|
||||||
block-obj-y \
|
block-obj-y \
|
||||||
block-obj-m \
|
block-obj-m \
|
||||||
chardev-obj-y \
|
|
||||||
common-obj-y \
|
common-obj-y \
|
||||||
common-obj-m)
|
common-obj-m)
|
||||||
all-obj-y += $(common-obj-y)
|
all-obj-y += $(common-obj-y)
|
||||||
|
|
|
@ -1,23 +1,4 @@
|
||||||
chardev-obj-y += char.o
|
|
||||||
chardev-obj-$(CONFIG_SOFTMMU) += chardev-sysemu.o
|
chardev-obj-$(CONFIG_SOFTMMU) += chardev-sysemu.o
|
||||||
chardev-obj-$(CONFIG_WIN32) += char-console.o
|
|
||||||
chardev-obj-$(CONFIG_POSIX) += char-fd.o
|
|
||||||
chardev-obj-y += char-fe.o
|
|
||||||
chardev-obj-y += char-file.o
|
|
||||||
chardev-obj-y += char-io.o
|
|
||||||
chardev-obj-y += char-mux.o
|
|
||||||
chardev-obj-y += char-null.o
|
|
||||||
chardev-obj-$(CONFIG_POSIX) += char-parallel.o
|
|
||||||
chardev-obj-y += char-pipe.o
|
|
||||||
chardev-obj-$(CONFIG_POSIX) += char-pty.o
|
|
||||||
chardev-obj-y += char-ringbuf.o
|
|
||||||
chardev-obj-y += char-serial.o
|
|
||||||
chardev-obj-y += char-socket.o
|
|
||||||
chardev-obj-y += char-stdio.o
|
|
||||||
chardev-obj-y += char-udp.o
|
|
||||||
chardev-obj-$(CONFIG_WIN32) += char-win.o
|
|
||||||
chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o
|
|
||||||
|
|
||||||
common-obj-$(CONFIG_SOFTMMU) += msmouse.o wctablet.o testdev.o
|
common-obj-$(CONFIG_SOFTMMU) += msmouse.o wctablet.o testdev.o
|
||||||
|
|
||||||
ifeq ($(CONFIG_BRLAPI),y)
|
ifeq ($(CONFIG_BRLAPI),y)
|
||||||
|
|
32
chardev/meson.build
Normal file
32
chardev/meson.build
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
chardev_ss = ss.source_set()
|
||||||
|
chardev_ss.add(files(
|
||||||
|
'char-fe.c',
|
||||||
|
'char-file.c',
|
||||||
|
'char-io.c',
|
||||||
|
'char-mux.c',
|
||||||
|
'char-null.c',
|
||||||
|
'char-pipe.c',
|
||||||
|
'char-ringbuf.c',
|
||||||
|
'char-serial.c',
|
||||||
|
'char-socket.c',
|
||||||
|
'char-stdio.c',
|
||||||
|
'char-udp.c',
|
||||||
|
'char.c',
|
||||||
|
))
|
||||||
|
chardev_ss.add(when: 'CONFIG_POSIX', if_true: files(
|
||||||
|
'char-fd.c',
|
||||||
|
'char-parallel.c',
|
||||||
|
'char-pty.c',
|
||||||
|
))
|
||||||
|
chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
|
||||||
|
'char-console.c',
|
||||||
|
'char-win-stdio.c',
|
||||||
|
'char-win.c',
|
||||||
|
))
|
||||||
|
|
||||||
|
chardev_ss = chardev_ss.apply(config_host, strict: false)
|
||||||
|
libchardev = static_library('chardev', chardev_ss.sources() + genh,
|
||||||
|
name_suffix: 'fa',
|
||||||
|
build_by_default: false)
|
||||||
|
|
||||||
|
chardev = declare_dependency(link_whole: libchardev)
|
|
@ -454,6 +454,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
|
||||||
sources: genh + version_res)
|
sources: genh + version_res)
|
||||||
|
|
||||||
subdir('io')
|
subdir('io')
|
||||||
|
subdir('chardev')
|
||||||
subdir('fsdev')
|
subdir('fsdev')
|
||||||
subdir('target')
|
subdir('target')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue