build: simplify clean handling of extras directory

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@suse.com>

diff --git a/.gitignore b/.gitignore
index 287166f8fce419808ad42470809bad687c3060d9..2cea99493484c16672290fcc1cea86d2e15b66b2 100644 (file)
--- 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/Makefile b/Makefile
index b93b22c752520889f2e905ead305af04589472c3..a6ca348476e6f244d14ab1d66672a9887be9dd42 100644 (file)
--- 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: