diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-23 23:28:20 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-23 07:55:22 +0200 |
| commit | aa7bd942498512d6b77d1d0da846a8ecdd5d6186 (patch) | |
| tree | 9a420b59a1e862ea47a4c5f89601ffbdf3366922 /arch/um/Makefile | |
| parent | x86, um: merge Kconfig.i386 and Kconfig.x86_64 (diff) | |
| download | linux-aa7bd942498512d6b77d1d0da846a8ecdd5d6186.tar.xz linux-aa7bd942498512d6b77d1d0da846a8ecdd5d6186.zip | |
x86, um: get rid of header symlinks
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index bc070cef3ceb..2606bdaefcb6 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -18,28 +18,23 @@ core-y += $(ARCH_DIR)/kernel/ \ $(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/os-$(OS)/ -# Have to precede the include because the included Makefiles reference them. -SYMLINK_HEADERS := archparam.h processor.h ptrace.h module.h elf.h -SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header)) - # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes # ../os/include/file.h # # These are cleaned up during mrproper. Please DO NOT fix it again, this is # the Correct Thing(tm) to do! -ARCH_SYMLINKS = $(ARCH_DIR)/os \ - $(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h +ARCH_SYMLINKS = $(ARCH_DIR)/os $(ARCH_DIR)/include/shared/uml-config.h MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas include $(srctree)/$(ARCH_DIR)/Makefile-skas -ARCH_INCLUDE := -I$(ARCH_DIR)/include/shared +ARCH_INCLUDE := -I$(srctree)/$(ARCH_DIR)/include/shared +ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared ifneq ($(KBUILD_SRC),) -ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared -KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for SYMLINK_HEADERS +ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for three generated files endif -ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # for sysdep +KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so # named - it's a common symbol in libpcap, so we get a binary which crashes. @@ -144,15 +139,6 @@ archclean: @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ -o -name '*.gcov' \) -type f -print | xargs rm -f -$(SYMLINK_HEADERS): - @echo ' SYMLINK $@' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm - $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/asm/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ -else - $(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ -endif - $(objtree)/$(ARCH_DIR)/include/shared: @echo ' MKDIR $@' $(Q)mkdir -p $@ |