diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-11-25 14:06:37 +0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-12-08 13:48:58 -0500 |
| commit | 0df750e9d3a5fea5e19f4750582121c9293a9d71 (patch) | |
| tree | d1333e36fdf7bc7d8e5dbbbc8c7398748d6a2756 /contrib/vhost-user-input | |
| parent | 3d22bd27acd93281354b10c6bf787b720685eb80 (diff) | |
| download | qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.zip qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.tar.gz qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.tar.bz2 | |
libvhost-user: make it a meson subproject
By making libvhost-user a subproject, check it builds
standalone (without the global QEMU cflags etc).
Note that the library still relies on QEMU include/qemu/atomic.h and
linux_headers/.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201125100640.366523-6-marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'contrib/vhost-user-input')
| -rw-r--r-- | contrib/vhost-user-input/main.c | 3 | ||||
| -rw-r--r-- | contrib/vhost-user-input/meson.build | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c index 6020c6f..3ea840c 100644 --- a/contrib/vhost-user-input/main.c +++ b/contrib/vhost-user-input/main.c @@ -12,8 +12,7 @@ #include "qemu/iov.h" #include "qemu/bswap.h" #include "qemu/sockets.h" -#include "contrib/libvhost-user/libvhost-user.h" -#include "contrib/libvhost-user/libvhost-user-glib.h" +#include "libvhost-user-glib.h" #include "standard-headers/linux/virtio_input.h" #include "qapi/error.h" diff --git a/contrib/vhost-user-input/meson.build b/contrib/vhost-user-input/meson.build index 1eeb132..21a9ed4 100644 --- a/contrib/vhost-user-input/meson.build +++ b/contrib/vhost-user-input/meson.build @@ -1,5 +1,4 @@ executable('vhost-user-input', files('main.c'), - link_with: libvhost_user, - dependencies: qemuutil, + dependencies: [qemuutil, vhost_user], build_by_default: targetos == 'linux', install: false) |