From: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
Makefile | 4 ----
meson.build | 9 ++++++++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 8d3c8d8fbd..3addf50636 100644
--- a/Makefile
+++ b/Makefile
@@ -197,8 +197,6 @@ LIBS+=-lz $(LIBS_TOOLS)
HELPERS-y = $(HELPERS)
-HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) +=
qemu-bridge-helper$(EXESUF)
-
# Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from
@@ -431,8 +429,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y)
$(crypto-obj-y) $(io
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y)
$(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y)
$(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y)
$(storage-daemon-obj-y) $(COMMON_LDADDS)
-qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS)
-
qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS)
qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS)
diff --git a/meson.build b/meson.build
index 5cd8ee0298..3568b4816e 100644
--- a/meson.build
+++ b/meson.build
@@ -297,7 +297,6 @@ qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
# Other build targets
-
if 'CONFIG_GUEST_AGENT' in config_host
subdir('qga')
endif
@@ -315,6 +314,14 @@ if have_tools
subdir('contrib/vhost-user-input')
subdir('contrib/vhost-user-scsi')
endif
+
+ if targetos == 'linux'
+ executable('qemu-bridge-helper', files('qemu-bridge-helper.c'),
+ dependencies: [qemuutil, libcap_ng],
+ install: true,
+ install_dir: get_option('libexecdir'))
+ endif
+
if 'CONFIG_IVSHMEM' in config_host
subdir('contrib/ivshmem-client')
subdir('contrib/ivshmem-server')
--
2.26.2
