mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
Makefile: remove dead variables and includes
Makefile.objs, the .d files and various CONFIG_* symbols are not used anymore by the Make side of the build; they are only processed by Meson. We can delete them. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
parent
a98006bc79
commit
296bf3d12b
20
Makefile
20
Makefile
|
|
@ -80,13 +80,6 @@ seems to have been used for an in-tree build. You can fix this by running \
|
|||
endif
|
||||
endif
|
||||
|
||||
CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
|
||||
CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
|
||||
CONFIG_XEN := $(CONFIG_XEN_BACKEND)
|
||||
CONFIG_ALL=y
|
||||
-include config-all-devices.mak
|
||||
-include config-all-disas.mak
|
||||
|
||||
config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION
|
||||
@echo $@ is out-of-date, running configure
|
||||
@if test -f meson-private/coredata.dat; then \
|
||||
|
|
@ -117,9 +110,6 @@ build.ninja: config-host.mak
|
|||
|
||||
include $(SRC_PATH)/rules.mak
|
||||
|
||||
# lor is defined in rules.mak
|
||||
CONFIG_BLOCK := $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
|
||||
|
||||
generated-files-y += .git-submodule-status
|
||||
|
||||
# Don't try to regenerate Makefile or configure
|
||||
|
|
@ -132,14 +122,8 @@ configure: ;
|
|||
|
||||
$(call set-vpath, $(SRC_PATH))
|
||||
|
||||
LIBS+=-lz $(LIBS_TOOLS)
|
||||
|
||||
SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
|
||||
|
||||
ifneq ($(wildcard config-host.mak),)
|
||||
include $(SRC_PATH)/Makefile.objs
|
||||
endif
|
||||
|
||||
include $(SRC_PATH)/tests/Makefile.include
|
||||
|
||||
all: recurse-all
|
||||
|
|
@ -256,10 +240,6 @@ Makefile: $(generated-files-y)
|
|||
endif
|
||||
endif
|
||||
|
||||
# Include automatically generated dependency files
|
||||
# Dependencies in Makefile.objs files come from our recursive subdir rules
|
||||
-include $(wildcard *.d tests/*.d)
|
||||
|
||||
include $(SRC_PATH)/tests/docker/Makefile.include
|
||||
include $(SRC_PATH)/tests/vm/Makefile.include
|
||||
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
#######################################################################
|
||||
# Common libraries for tools and emulators
|
||||
qom-obj-y = qom/libqom.fa
|
||||
|
||||
#######################################################################
|
||||
# code used by both qemu system emulation and qemu-img
|
||||
|
||||
ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
|
||||
|
||||
authz-obj-y = authz/libauthz.fa
|
||||
authz/libauthz.fa-libs = $(if $(CONFIG_AUTH_PAM),-lpam)
|
||||
|
||||
block-obj-y += libblock.fa
|
||||
|
||||
libblock.fa-libs = $(ZSTD_LIBS)
|
||||
libblock.fa-libs += $(LIBNFS_LIBS)
|
||||
libblock.fa-libs += $(LIBISCSI_LIBS)
|
||||
libblock.fa-libs += $(CURL_LIBS)
|
||||
libblock.fa-libs += $(RBD_LIBS)
|
||||
libblock.fa-libs += $(GLUSTERFS_LIBS)
|
||||
libblock.fa-libs += $(VXHS_LIBS)
|
||||
libblock.fa-libs += $(LIBSSH_LIBS)
|
||||
libblock.fa-libs += $(BZIP2_LIBS)
|
||||
libblock.fa-libs += $(LZFSE_LIBS)
|
||||
libblock.fa-libs += $(if $(CONFIG_LINUX_AIO),-laio)
|
||||
libblock.fa-libs += $(LIBXML2_LIBS)
|
||||
|
||||
chardev-obj-y = chardev/libchardev.fa
|
||||
|
||||
crypto-obj-y = crypto/libcrypto.fa
|
||||
|
||||
io-obj-y = io/libio.fa
|
||||
|
||||
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
|
||||
|
|
@ -40,41 +40,6 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
|
|||
|
||||
SPEED = quick
|
||||
|
||||
# gtester tests, possibly with verbose output
|
||||
# do_test_tap runs all tests, even if some of them fail, while do_test_human
|
||||
# stops at the first failure unless -k is given on the command line
|
||||
|
||||
define do_test_human_k
|
||||
$(quiet-@)rc=0; $(foreach COMMAND, $1, \
|
||||
$(call quiet-command-run, \
|
||||
export MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} $2; \
|
||||
$(COMMAND) -m=$(SPEED) -k --tap < /dev/null \
|
||||
| ./scripts/tap-driver.pl --test-name="$(notdir $(COMMAND))" $(if $(V),, --show-failures-only) \
|
||||
|| rc=$$?;, "TEST", "$@: $(COMMAND)")) exit $$rc
|
||||
endef
|
||||
define do_test_human_no_k
|
||||
$(foreach COMMAND, $1, \
|
||||
$(call quiet-command, \
|
||||
MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} $2 \
|
||||
$(COMMAND) -m=$(SPEED) -k --tap < /dev/null \
|
||||
| ./scripts/tap-driver.pl --test-name="$(notdir $(COMMAND))" $(if $(V),, --show-failures-only), \
|
||||
"TEST", "$@: $(COMMAND)")
|
||||
)
|
||||
endef
|
||||
do_test_human = \
|
||||
$(if $(findstring k, $(MAKEFLAGS)), $(do_test_human_k), $(do_test_human_no_k))
|
||||
|
||||
define do_test_tap
|
||||
$(call quiet-command, \
|
||||
{ export MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} $2; \
|
||||
$(foreach COMMAND, $1, \
|
||||
$(COMMAND) -m=$(SPEED) -k --tap < /dev/null \
|
||||
| sed "s/^\(not \)\?ok [0-9]* /&$(notdir $(COMMAND)) /" || true; ) } \
|
||||
| ./scripts/tap-merge.pl | tee "$@" \
|
||||
| ./scripts/tap-driver.pl $(if $(V),, --show-failures-only), \
|
||||
"TAP","$@")
|
||||
endef
|
||||
|
||||
# Per guest TCG tests
|
||||
|
||||
BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS))
|
||||
|
|
@ -182,7 +147,6 @@ endif
|
|||
check-build: $(QEMU_IOTESTS_HELPERS-y)
|
||||
|
||||
check-clean:
|
||||
rm -rf tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
|
||||
rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
|
||||
|
||||
clean: check-clean
|
||||
|
|
@ -191,8 +155,4 @@ clean: check-clean
|
|||
|
||||
check-speed: bench-speed
|
||||
|
||||
# Build the help program automatically
|
||||
|
||||
-include $(wildcard tests/*.d)
|
||||
|
||||
endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue