]> Git Repo - qemu.git/blobdiff - Makefile
sd: sdhci: Implement basic vendor specific register support
[qemu.git] / Makefile
index 7df22fcc5dac4133dba18c761052e1e234cac07a..ed0ed93b2d6405b7ac1bfdb5424c4cc98febb3ec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -336,16 +336,16 @@ $(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)
 vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
 endif
 
-ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
+ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyyy)
 HELPERS-y += virtiofsd$(EXESUF)
 vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json
 endif
@@ -582,7 +582,6 @@ $(ROM_DIRS_RULES):
 
 .PHONY: recurse-all recurse-clean recurse-install
 recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
-recurse-fuzz: $(addsuffix /fuzz, $(TARGET_DIRS) $(ROM_DIRS))
 recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
 recurse-install: $(addsuffix /install, $(TARGET_DIRS))
 $(addsuffix /install, $(TARGET_DIRS)): all
@@ -795,7 +794,7 @@ rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.js $(M
 endef
 
 distclean: clean
-       rm -f config-host.mak config-host.h* config-host.ld $(DOCS)
+       rm -f config-host.mak config-host.h* $(DOCS)
        rm -f tests/tcg/config-*.mak
        rm -f config-all-devices.mak config-all-disas.mak config.status
        rm -f $(SUBDIR_DEVICES_MAK)
@@ -848,7 +847,7 @@ u-boot.e500 u-boot-sam460-20100605.bin \
 qemu_vga.ndrv \
 edk2-licenses.txt \
 hppa-firmware.img \
-opensbi-riscv32-virt-fw_jump.bin \
+opensbi-riscv32-sifive_u-fw_jump.bin opensbi-riscv32-virt-fw_jump.bin \
 opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin
 
 
@@ -1076,7 +1075,7 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \
 # Note the use of different doctree for each (manual, builder) tuple;
 # this works around Sphinx not handling parallel invocation on
 # a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946
-build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" $(SPHINX_BUILD) $(if $(V),,-q) -W -b $2 -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1")
+build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" $(SPHINX_BUILD) $(if $(V),,-q) $(SPHINX_WERROR) -b $2 -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1")
 # We assume all RST files in the manual's directory are used in it
 manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst $(SRC_PATH)/docs/$1/*/*.rst) \
               $(SRC_PATH)/docs/defs.rst.inc \
@@ -1235,50 +1234,66 @@ endif
 include $(SRC_PATH)/tests/docker/Makefile.include
 include $(SRC_PATH)/tests/vm/Makefile.include
 
+print-help-run = printf "  %-30s - %s\\n" "$1" "$2"
+print-help = $(quiet-@)$(call print-help-run,$1,$2)
+
 .PHONY: help
 help:
        @echo  'Generic targets:'
-       @echo  '  all             - Build all'
+       $(call print-help,all,Build all)
 ifdef CONFIG_MODULES
-       @echo  '  modules         - Build all modules'
+       $(call print-help,modules,Build all modules)
 endif
-       @echo  '  dir/file.o      - Build specified target only'
-       @echo  '  install         - Install QEMU, documentation and tools'
-       @echo  '  ctags/TAGS      - Generate tags file for editors'
-       @echo  '  cscope          - Generate cscope index'
+       $(call print-help,dir/file.o,Build specified target only)
+       $(call print-help,install,Install QEMU, documentation and tools)
+       $(call print-help,ctags/TAGS,Generate tags file for editors)
+       $(call print-help,cscope,Generate cscope index)
        @echo  ''
        @$(if $(TARGET_DIRS), \
                echo 'Architecture specific targets:'; \
                $(foreach t, $(TARGET_DIRS), \
-               printf "  %-30s - Build for %s\\n" $(t)/all $(t);) \
+               $(call print-help-run,$(t)/all,Build for $(t)); \
+               $(if $(CONFIG_FUZZ), \
+                       $(if $(findstring softmmu,$(t)), \
+                               $(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), \
+               $(call print-help-run,$(t),Build $(shell basename $(t)) tool);) \
                echo '')
        @echo  'Cleaning targets:'
-       @echo  '  clean           - Remove most generated files but keep the config'
+       $(call print-help,clean,Remove most generated files but keep the config)
 ifdef CONFIG_GCOV
-       @echo  '  clean-coverage  - Remove coverage files'
+       $(call print-help,clean-coverage,Remove coverage files)
 endif
-       @echo  '  distclean       - Remove all generated files'
-       @echo  '  dist            - Build a distributable tarball'
+       $(call print-help,distclean,Remove all generated files)
+       $(call print-help,dist,Build a distributable tarball)
        @echo  ''
        @echo  'Test targets:'
-       @echo  '  check           - Run all tests (check-help for details)'
-       @echo  '  docker          - Help about targets running tests inside containers'
-       @echo  '  vm-help         - Help about targets running tests inside VM'
+       $(call print-help,check,Run all tests (check-help for details))
+       $(call print-help,docker,Help about targets running tests inside containers)
+       $(call print-help,vm-help,Help about targets running tests inside VM)
        @echo  ''
        @echo  'Documentation targets:'
-       @echo  '  html info pdf txt'
-       @echo  '                  - Build documentation in specified format'
+       $(call print-help,html info pdf txt,Build documentation in specified format)
 ifdef CONFIG_GCOV
-       @echo  '  coverage-report - Create code coverage report'
+       $(call print-help,coverage-report,Create code coverage report)
 endif
        @echo  ''
 ifdef CONFIG_WIN32
        @echo  'Windows targets:'
-       @echo  '  installer       - Build NSIS-based installer for QEMU'
+       $(call print-help,installer,Build NSIS-based installer for QEMU)
 ifdef QEMU_GA_MSI_ENABLED
-       @echo  '  msi             - Build MSI-based installer for qemu-ga'
+       $(call print-help,msi,Build MSI-based installer for qemu-ga)
 endif
        @echo  ''
 endif
-       @echo  '  $(MAKE) [targets]      (quiet build, default)'
-       @echo  '  $(MAKE) V=1 [targets]  (verbose build)'
+       $(call print-help,$(MAKE) [targets],(quiet build, default))
+       $(call print-help,$(MAKE) V=1 [targets],(verbose build))
This page took 0.028425 seconds and 4 git commands to generate.