Il 16/11/2012 12:01, Wenchao Xia ha scritto: >> >> >> ifneq ($(wildcard config-host.mak),) >> include $(SRC_PATH)/tests/Makefile >> endif >> >> to >> >> -include $(SRC_PATH)/tests/Makefile >> >> ? >> > yes, but original author seems not include tests/Makefile in > this condition on purpose, so using MAKEFILES to keep it unchanged.
git blame tells you that the ifneq was added by commit e454e2e (Makefile: Exclude tests/Makefile in unconfigured tree, 2012-01-17). Instead of the ifneq, I proposed to use a minus in front of the include directive. It will avoid failures if tests/Makefile does not exist. However, it is not very good because it will cause /tests/Makefile to be opened (see the commit message of e454e2e). Perhaps an even better way to avoid the problem would be this: just move the removal of makefile fragments to the _end_ of "make distclean": diff --git a/Makefile b/Makefile index 81c660f..b994109 100644 --- a/Makefile +++ b/Makefile @@ -203,9 +203,7 @@ qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated gen-out-type = $(subst .,-,$(suffix $@)) -ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/tests/Makefile -endif qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py @@ -265,8 +263,7 @@ qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)" distclean: clean - rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi - rm -f config-all-devices.mak + rm -f config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys @@ -279,6 +276,7 @@ distclean: clean rm -rf $$d || exit 1 ; \ done test -f pixman/config.log && make -C pixman distclean + rm -f config-host.mak rm -f config-all-devices.mak KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \ ar de en-us fi fr-be hr it lv nl pl ru th \ With this change, no need for MAKEFILES anymore. Paolo