Message ID | 20150907203723.10296.29727@loki |
---|---|
State | New |
Headers | show |
On 07/09/2015 22:37, Michael Roth wrote: > This kinda does it, although it introduces a circular dependency warning > on posix (since qemu-ga$(EXESUF) == qemu-ga there, yet qemu-ga has > a qemu-ga$(EXESUF) dependency. > > Could be fixed by making a new 'qemu-guest-agent' do-the-right-thing target, > but that means new build process for posix and w32 instead of just w32. The > alternative is to only define the 'qemu-ga' do-the-right-thing target for w32 > (since posix already has such a target). That requires a Makefile ifdef MINGW > or somesuch though, which isn't ideal. I think the latter is worth the > simplified build process (same as we currently do on posix, but with some > extra config params) Or just "ifneq ($(EXESUF),)". Paolo
Quoting Paolo Bonzini (2015-09-07 15:39:39) > > > On 07/09/2015 22:37, Michael Roth wrote: > > This kinda does it, although it introduces a circular dependency warning > > on posix (since qemu-ga$(EXESUF) == qemu-ga there, yet qemu-ga has > > a qemu-ga$(EXESUF) dependency. > > > > Could be fixed by making a new 'qemu-guest-agent' do-the-right-thing target, > > but that means new build process for posix and w32 instead of just w32. The > > alternative is to only define the 'qemu-ga' do-the-right-thing target for w32 > > (since posix already has such a target). That requires a Makefile ifdef MINGW > > or somesuch though, which isn't ideal. I think the latter is worth the > > simplified build process (same as we currently do on posix, but with some > > extra config params) > > Or just "ifneq ($(EXESUF),)". Thanks, that would work. Also noticed I forget the MSI dependency in previous patch. Will send a proper patch soon. > > Paolo >
diff --git a/Makefile b/Makefile index 9ce3972..d0ee41e 100644 --- a/Makefile +++ b/Makefile @@ -293,15 +293,15 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) # we require QGA_VSS_PROVIDER files to be built alongside qemu-ga # executable since they are shipped together, but we don't want to actually # link against them -qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a $(QGA_VSS_PROVIDER) - $(call LINK, $(filter-out $(QGA_VSS_PROVIDER), $^)) +qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a + $(call LINK, $^) ifdef QEMU_GA_MSI_ENABLED QEMU_GA_MSI=qemu-ga-$(ARCH).msi msi: $(QEMU_GA_MSI) -$(QEMU_GA_MSI): qemu-ga.exe +$(QEMU_GA_MSI): qemu-ga.exe $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI): config-host.mak @@ -313,6 +313,8 @@ msi: @echo "MSI build not configured or dependency resolution failed (reconfigure with --enable-guest-agent-msi option)" endif +qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h