blockdev: convert internal NBD server to QIONetListener

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 814f6820d96bc39b2ca8d920e84515cb31aec6be..d86ecd2dd4e8b3009c62153f9a415fa3b5970029 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,10 @@ BUILD_DIR=$(CURDIR)
 # Before including a proper config-host.mak, assume we are in the source tree
 SRC_PATH=.
 
-UNCHECKED_GOALS := %clean TAGS cscope ctags docker docker-%
+UNCHECKED_GOALS := %clean TAGS cscope ctags dist \
+    html info pdf txt \
+    help check-help \
+    docker docker-% vm-test vm-build-%
 
 # All following code might depend on configuration variables
 ifneq ($(wildcard config-host.mak),)
@@ -50,7 +53,7 @@ ifneq ($(realpath $(SRC_PATH)),$(realpath .))
 ifneq ($(wildcard $(SRC_PATH)/config-host.mak),)
 $(error This is an out of tree build but your source tree ($(SRC_PATH)) \
 seems to have been used for an in-tree build. You can fix this by running \
-"make distclean && rm -rf *-linux-user *-softmmu" in your source tree)
+"$(MAKE) distclean && rm -rf *-linux-user *-softmmu" in your source tree)
 endif
 endif
 
@@ -229,6 +232,7 @@ KEYCODEMAP_FILES = \
                 ui/input-keymap-linux-to-qcode.c \
                 ui/input-keymap-qcode-to-qnum.c \
                 ui/input-keymap-qnum-to-qcode.c \
+                ui/input-keymap-qcode-to-linux.c \
                 $(NULL)
 
 GENERATED_FILES += $(KEYCODEMAP_FILES)
@@ -253,7 +257,7 @@ Makefile: ;
 configure: ;
 
 .PHONY: all clean cscope distclean html info install install-doc \
-       pdf txt recurse-all speed test dist msi FORCE
+       pdf txt recurse-all dist msi FORCE
 
 $(call set-vpath, $(SRC_PATH))
 
@@ -303,7 +307,7 @@ endif
            else \
              echo "WARNING: $@ out of date.";\
            fi; \
-           echo "Run \"make defconfig\" to regenerate."; \
+           echo "Run \"$(MAKE) defconfig\" to regenerate."; \
            rm [email protected]; \
          fi; \
         else \
@@ -716,10 +720,6 @@ endif
        $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
         done
 
-# various test targets
-test speed: all
-       $(MAKE) -C tests/tcg $@
-
 .PHONY: ctags
 ctags:
        rm -f tags
@@ -937,4 +937,4 @@ ifdef QEMU_GA_MSI_ENABLED
 endif
        @echo  ''
 endif
-       @echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
+       @echo  '  $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'