[PATCH] build: simplify clean handling of extras directory

[Juergen Gross <jgross@xxxxxxxx>]

The extras directory is used only as a download target for Mini-OS
sources. Instead of special handling extras/mini-os* in .gitignore and
the clean targets, just use extras for that purpose.

So add "extras" to .gitignore and remove it when doing a
"make distclean".

Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
 .gitignore | 2 +-
 .hgignore  | 6 +-----
 Makefile   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c1b73b0968..2d4baa4395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,7 +63,7 @@ docs/man7/
 docs/man8/
 docs/pdf/
 docs/txt/
-extras/mini-os*
+extras/
 install/*
 stubdom/*-minios-config.mk
 stubdom/autom4te.cache/
diff --git a/.hgignore b/.hgignore
index 2d41670632..030d97803e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -77,11 +77,7 @@
 ^docs/xen-api/vm_lifecycle.eps$
 ^docs/xen-api/xenapi-datamodel-graph.eps$
 ^docs/xen-api/xenapi.out$
-^extras/mini-os/include/list\.h$
-^extras/mini-os/include/mini-os$
-^extras/mini-os/include/x86/mini-os$
-^extras/mini-os/include/xen$
-^extras/mini-os/mini-os.*$
+^extras/
 ^install/.*$
 ^linux-[^/]*-paravirt/.*$
 ^linux-2.6[^/]*/.*$
diff --git a/Makefile b/Makefile
index b93b22c752..a6ca348476 100644
--- a/Makefile
+++ b/Makefile
@@ -246,6 +246,7 @@ clean-docs:
 # clean, but blow away tarballs
 .PHONY: distclean
 distclean: $(TARGS_DISTCLEAN)
+       rm -rf extras
        $(MAKE) -C tools/include distclean
        rm -f config/Toplevel.mk
        rm -rf dist
@@ -265,7 +266,6 @@ distclean-stubdom:
 ifeq (x86_64,$(XEN_TARGET_ARCH))
        XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom distclean
 endif
-       rm -rf extras/mini-os extras/mini-os-remote
 
 .PHONY: distclean-docs
 distclean-docs:
-- 
2.35.3