[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 043/150] meson: convert dummy Windows qga/qemu-ga target
From: |
Paolo Bonzini |
Subject: |
[PULL 043/150] meson: convert dummy Windows qga/qemu-ga target |
Date: |
Tue, 18 Aug 2020 10:08:38 -0400 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
qga/meson.build | 4 ++++
qga/vss-win32/meson.build | 2 ++
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index f8e5ebaff9..a61c66096e 100644
--- a/Makefile
+++ b/Makefile
@@ -441,11 +441,6 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
$(SRC_PATH)/scripts/hxtool
qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS)
qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS)
-ifneq ($(EXESUF),)
-.PHONY: qga/qemu-ga
-qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
-endif
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/qga/meson.build b/qga/meson.build
index 33f6db2865..2b91261427 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -44,6 +44,7 @@ qga = executable('qemu-ga', qga_ss.sources(),
link_args: config_host['LIBS_QGA'].split(),
dependencies: [qemuutil, libudev],
install: true)
+all_qga = [qga]
if targetos == 'windows'
if 'CONFIG_QGA_VSS' in config_host
@@ -72,6 +73,9 @@ if targetos == 'windows'
config_host['QEMU_GA_MSI_WITH_VSS'].split(),
config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
])
+ all_qga += [qga_msi]
alias_target('msi', qga_msi)
endif
endif
+
+alias_target('qemu-ga', all_qga)
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 1f39e05335..780c461432 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -14,6 +14,8 @@ if add_languages('cpp', required: false)
cc.find_library('shlwapi'),
cc.find_library('uuid'),
cc.find_library('intl')])
+
+ all_qga += qga_vss
endif
# rules to build qga-vss.tlb
--
2.26.2
- [PULL 044/150] meson: add qemu-bridge-helper, (continued)
- [PULL 044/150] meson: add qemu-bridge-helper, Paolo Bonzini, 2020/08/18
- [PULL 042/150] meson: add msi generation, Paolo Bonzini, 2020/08/18
- [PULL 046/150] meson: add qemu-edid, Paolo Bonzini, 2020/08/18
- [PULL 038/150] meson: add macos dependencies, Paolo Bonzini, 2020/08/18
- [PULL 025/150] libqemuutil, qapi, trace: convert to meson, Paolo Bonzini, 2020/08/18
- [PULL 033/150] contrib/rdmacm-mux: convert to Meson, Paolo Bonzini, 2020/08/18
- [PULL 037/150] contrib/elf2dmp: convert to meson, Paolo Bonzini, 2020/08/18
- [PULL 039/150] meson: add solaris and Haiku libraries, Paolo Bonzini, 2020/08/18
- [PULL 045/150] meson: add qemu-keymap, Paolo Bonzini, 2020/08/18
- [PULL 041/150] meson: convert vss-win32, Paolo Bonzini, 2020/08/18
- [PULL 043/150] meson: convert dummy Windows qga/qemu-ga target,
Paolo Bonzini <=
- [PULL 050/150] meson: generate shader headers, Paolo Bonzini, 2020/08/18
- [PULL 049/150] meson: generate qemu-version.h, Paolo Bonzini, 2020/08/18
- [PULL 052/150] meson: handle edk2 bios and descriptors, Paolo Bonzini, 2020/08/18
- [PULL 047/150] meson: add virtfs-proxy-helper, Paolo Bonzini, 2020/08/18
- [PULL 048/150] meson: keymap-gen, Paolo Bonzini, 2020/08/18
- [PULL 051/150] meson: generate hxtool files, Paolo Bonzini, 2020/08/18
- [PULL 058/150] meson: convert crypto directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 059/150] meson: convert io directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 040/150] meson: convert qemu-ga, Paolo Bonzini, 2020/08/18
- [PULL 054/150] meson: convert tests/fp and check-softfloat, Paolo Bonzini, 2020/08/18