Commit 0814465a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

qemu-ga: clean up TOOLS variable 



qemu-ga is included in the TOOLS variable without the .exe suffix, and this is
then worked around twice in the Makefile.  Do the right thing in configure
instead.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e65472c7

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ clean: recurse-clean 
		! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \

		-exec rm {} +

	rm -f $(edk2-decompressed)

	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga$(EXESUF) TAGS cscope.* *.pod *~ */*~

	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~

	rm -f fsdev/*.pod scsi/*.pod

	rm -f qemu-img-cmds.h

	rm -f ui/shader/*-vert.h ui/shader/*-frag.h
@@ -845,7 +845,7 @@ install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstated 
	$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \

	recurse-install

ifneq ($(TOOLS),)

	$(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))

	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))

endif

ifneq ($(CONFIG_MODULES),)

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)"

configure

+1 −1
Original line number Diff line number Diff line
@@ -6129,7 +6129,7 @@ if [ "$guest_agent" != "no" ]; then 
  if [ "$softmmu" = no -a "$want_tools" = no ] ; then

      guest_agent=no

  elif [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then

      tools="qemu-ga $tools"

      tools="qemu-ga\$(EXESUF) $tools"

      guest_agent=yes

  elif [ "$guest_agent" != yes ]; then

      guest_agent=no