Commit fdbff6bd authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

Makefile: Let the 'help' target list the helper targets 



List the name of the helper targets when calling 'make help',
along with the tool targets:

  $ make help
  [...]

  Helper targets:
    fsdev/virtfs-proxy-helper      - Build virtfs-proxy-helper
    scsi/qemu-pr-helper            - Build qemu-pr-helper
    qemu-bridge-helper             - Build qemu-bridge-helper
    vhost-user-gpu                 - Build vhost-user-gpu
    virtiofsd                      - Build virtiofsd

  Tools targets:
    qemu-ga                        - Build qemu-ga tool
    qemu-keymap                    - Build qemu-keymap tool
    elf2dmp                        - Build elf2dmp tool
    ivshmem-client                 - Build ivshmem-client tool
    ivshmem-server                 - Build ivshmem-server tool
    qemu-nbd                       - Build qemu-nbd tool
    qemu-storage-daemon            - Build qemu-storage-daemon tool
    qemu-img                       - Build qemu-img tool
    qemu-io                        - Build qemu-io tool
    qemu-edid                      - Build qemu-edid tool

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 78f8d497

Makefile

+7 −2
Original line number Diff line number Diff line
@@ -336,9 +336,9 @@ $(call set-vpath, $(SRC_PATH)) 
LIBS+=-lz $(LIBS_TOOLS)



vhost-user-json-y =

HELPERS-y =

HELPERS-y = $(HELPERS)



HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)

HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)



ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)

HELPERS-y += vhost-user-gpu$(EXESUF)
@@ -1258,6 +1258,11 @@ endif 
				$(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \

		))) \

		echo '')

	@$(if $(HELPERS-y), \

		echo 'Helper targets:'; \

		$(foreach t, $(HELPERS-y), \

		$(call print-help-run,$(t),Build $(shell basename $(t)));) \

		echo '')

	@$(if $(TOOLS), \

		echo 'Tools targets:'; \

		$(foreach t, $(TOOLS), \

configure

+3 −2
Original line number Diff line number Diff line
@@ -6394,7 +6394,7 @@ if test "$softmmu" = yes ; then 
  if test "$linux" = yes; then

    if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then

      virtfs=yes

      tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"

      helpers="$helpers fsdev/virtfs-proxy-helper\$(EXESUF)"

    else

      if test "$virtfs" = yes; then

        error_exit "VirtFS requires libcap-ng devel and libattr devel"
@@ -6409,7 +6409,7 @@ if test "$softmmu" = yes ; then 
      fi

      mpath=no

    fi

    tools="$tools scsi/qemu-pr-helper\$(EXESUF)"

    helpers="$helpers scsi/qemu-pr-helper\$(EXESUF)"

  else

    if test "$virtfs" = yes; then

      error_exit "VirtFS is supported only on Linux"
@@ -7651,6 +7651,7 @@ else 
  QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"

fi



echo "HELPERS=$helpers" >> $config_host_mak

echo "TOOLS=$tools" >> $config_host_mak

echo "ROMS=$roms" >> $config_host_mak

echo "MAKE=$make" >> $config_host_mak