tools: Update distclean target to remove auto-gen'ed tarballs.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/Makefile b/tools/Makefile
index 73cf708b62751dda99a541694c33f95bc02486dc..f0c46ed8a7309e3a815dddfc12d5225b53679901 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -62,8 +62,11 @@ install: subdirs-install
        $(INSTALL_DIR) $(DESTDIR)/var/lib/xen
        $(INSTALL_DIR) $(DESTDIR)/var/lock/subsys
 
-.PHONY: clean distclean
-clean distclean: subdirs-clean
+.PHONY: clean
+clean: subdirs-clean
+
+.PHONY: distclean
+distclean: subdirs-distclean
 
 ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
@@ -121,3 +124,6 @@ subdir-clean-debugger/gdbsx:
 
 subdir-install-debugger/gdbsx:
        $(MAKE) -C debugger/gdbsx install
+
+subdir-distclean-firmware: .phony
+       $(MAKE) -C firmware distclean

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 8a691a9ab0d8176ce91191d8cea0fdd4d80b44b6..7982358f6be4f9ae4e8aefd9d7a538205ed97e4c 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -67,10 +67,13 @@ INSTALL_PYTHON_PROG = \
 %.o: %.cc
        $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
-subdirs-all subdirs-clean subdirs-install: .phony
+subdirs-all subdirs-clean subdirs-install subdirs-distclean: .phony
        @set -e; for subdir in $(SUBDIRS) $(SUBDIRS-y); do \
                $(MAKE) subdir-$(patsubst subdirs-%,%,$@)-$$subdir; \
        done
 
 subdir-all-% subdir-clean-% subdir-install-%: .phony
        $(MAKE) -C $* $(patsubst subdir-%-$*,%,$@)
+
+subdir-distclean-%: .phony
+       $(MAKE) -C $* clean

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 837f56f83ccfa56491627359596593db26de0ccc..0ce965e7492797f1ed78f8ff17ae2cd51d6cb139 100644 (file)
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -30,3 +30,9 @@ install: all
 
 .PHONY: clean
 clean: subdirs-clean
+
+.PHONY: distclean
+distclean: subdirs-distclean
+
+subdir-distclean-etherboot: .phony
+       $(MAKE) -C etherboot distclean
\ No newline at end of file

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index 13ea7213649ee0a897357a53b6e72444e6ed4664..1fd4ebc4912a918f12c15aaf8c7ec2c48dfe4508 100644 (file)
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -49,3 +49,7 @@ $D/src/bin/NIC: $D/src/arch/i386/Makefile
 .PHONY: clean
 clean:
        rm -rf $D $D.git *~ eb-roms.h
+
+.PHONY: distclean
+distclean: clean
+       rm -rf $T