Merge tag 'migration-20230518-pull-request' of https://gitlab.com/juan.quintela/qemu...

[mirror_qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index ce2f83a684f67ed4529e9753315d465e355d98fe..3c7d67142f13f6fbef5c15db2b6d9951e286a665 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ quiet-command-run = $(if $(V),,$(if $2,printf "  %-7s %s\n" $2 $3 && ))$1
 quiet-@ = $(if $(V),,@)
 quiet-command = $(quiet-@)$(call quiet-command-run,$1,$2,$3)
 
-UNCHECKED_GOALS := %clean TAGS cscope ctags dist \
+UNCHECKED_GOALS := TAGS gtags cscope ctags dist \
     help check-help print-% \
     docker docker-% vm-help vm-test vm-build-%
 
@@ -176,10 +176,8 @@ plugins:
 endif # $(CONFIG_PLUGIN)
 
 else # config-host.mak does not exist
-config-host.mak:
 ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
-       @echo "Please call configure before running make!"
-       @exit 1
+$(error Please call configure before running make)
 endif
 endif # config-host.mak does not exist
 
@@ -220,7 +218,7 @@ qemu-%.tar.bz2:
 
 distclean: clean recurse-distclean
        -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || :
-       rm -f config-host.mak Makefile.prereqs qemu-bundle
+       rm -f config-host.mak Makefile.prereqs
        rm -f tests/tcg/*/config-target.mak tests/tcg/config-host.mak
        rm -f config.status
        rm -f roms/seabios/config.mak
@@ -230,7 +228,7 @@ distclean: clean recurse-distclean
        rm -f Makefile.ninja Makefile.mtest build.ninja.stamp meson.stamp
        rm -f config.log
        rm -f linux-headers/asm
-       rm -Rf .sdk
+       rm -Rf .sdk qemu-bundle
 
 find-src-path = find "$(SRC_PATH)" -path "$(SRC_PATH)/meson" -prune -o \
        -type l -prune -o \( -name "*.[chsS]" -o -name "*.[ch].inc" \)