δΊ 2013-1-23 19:32, Paolo Bonzini ει:
Il 23/01/2013 12:17, Wenchao Xia ha scritto:
Now root Makefile simply calls the command and do not care
the details of it any more. $SUBDIR_CLEAN_RULES is used for the
case that a sub-dir's Makefile is included by root Makefile,
in which case 'clean' in subdir's Makefile will cause confict. So
If sub-dir's Makefile want to be cleaned, it should extend
$SUBDIR_CLEAN_RULES, just like tests/Makefile.
Signed-off-by: Wenchao Xia <xiaw...@linux.vnet.ibm.com>
---
Makefile | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 73adf42..69472b7 100644
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^)
-clean:
+clean: $(SUBDIR_CLEAN_RULES)
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h
gen-op-arm.h
rm -f qemu-options.def
@@ -226,7 +226,6 @@ clean:
rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp)
rm -rf qapi-generated
rm -rf qga/qapi-generated
- $(MAKE) -C tests/tcg clean
for d in $(ALL_SUBDIRS); do \
if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
rm -f $$d/qemu-options.def; \
Just use "clean: check-clean" and squash this with patch 1.
Paolo
That have a problem if test/Makefile is not included, which will
happen if make distclean is called once, then error will be shown
if make clean called again. It is also used by libqblock clean.
--
Best Regards
Wenchao Xia