2005-01-10 05:47:05

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 26/28] UML - Fix make clean

>From Chris Wright - make clean gets rid of more stuff

Signed-off-by: Jeff Dike <[email protected]>

Index: 2.6.10/arch/um/Makefile
===================================================================
--- 2.6.10.orig/arch/um/Makefile 2005-01-07 22:58:55.000000000 -0500
+++ 2.6.10/arch/um/Makefile 2005-01-09 15:46:08.000000000 -0500
@@ -14,11 +14,15 @@
core-y += $(ARCH_DIR)/kernel/ \
$(ARCH_DIR)/drivers/

+clean-dirs := sys-$(SUBARCH)
+
# Have to precede the include because the included Makefiles reference them.
SYMLINK_HEADERS = archparam.h system.h sigcontext.h processor.h ptrace.h \
arch-signal.h module.h vm-flags.h
SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))

+CLEAN_FILES += $(ARCH_SYMLINKS)
+
ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h

@@ -81,6 +85,9 @@

$(shell cd $(ARCH_DIR) && ln -sf Kconfig_$(SUBARCH) Kconfig_arch)

+CLEAN_FILES += $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h \
+ $(TOPDIR)/$(ARCH_DIR)/os
+
prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) \
$(ARCH_DIR)/kernel/vmlinux.lds.S

@@ -141,7 +148,8 @@
#When cleaning we don't include .config, so we don't include
#TT or skas makefiles and don't clean skas_ptregs.h.
CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \
- $(GEN_HEADERS) $(ARCH_DIR)/include/skas_ptregs.h
+ $(GEN_HEADERS) $(ARCH_DIR)/include/skas_ptregs.h \
+ $(ARCH_DIR)/util/mk_constants $(ARCH_DIR)/util/mk_task

MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \
$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os