diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:01:49 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:14:45 -0400 |
commit | 9e636452d0714b08e4f8f4c58b76c4b7d15ffffa (patch) | |
tree | c2e9a31b6f219b5d20662725288b948484c10f1f /arch/um/Makefile | |
parent | 945581d5bd796a046a42e3ee915bd9ec0c6853ca (diff) |
um: get rid of kern_constants.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/Makefile')
-rw-r--r-- | arch/um/Makefile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 3aded4e04f87..649aebcc6a4c 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
@@ -25,9 +25,6 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas | |||
25 | SHARED_HEADERS := $(ARCH_DIR)/include/shared | 25 | SHARED_HEADERS := $(ARCH_DIR)/include/shared |
26 | ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS) | 26 | ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS) |
27 | ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared | 27 | ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared |
28 | ifneq ($(KBUILD_SRC),) | ||
29 | ARCH_INCLUDE += -I$(SHARED_HEADERS) | ||
30 | endif | ||
31 | KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) | 28 | KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) |
32 | 29 | ||
33 | # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so | 30 | # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so |
@@ -87,7 +84,6 @@ endef | |||
87 | KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH) | 84 | KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH) |
88 | 85 | ||
89 | archprepare: include/generated/user_constants.h | 86 | archprepare: include/generated/user_constants.h |
90 | archprepare: $(SHARED_HEADERS)/kern_constants.h | ||
91 | 87 | ||
92 | LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static | 88 | LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static |
93 | LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib | 89 | LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib |
@@ -118,8 +114,7 @@ endef | |||
118 | 114 | ||
119 | # When cleaning we don't include .config, so we don't include | 115 | # When cleaning we don't include .config, so we don't include |
120 | # TT or skas makefiles and don't clean skas_ptregs.h. | 116 | # TT or skas makefiles and don't clean skas_ptregs.h. |
121 | CLEAN_FILES += linux x.i gmon.out \ | 117 | CLEAN_FILES += linux x.i gmon.out |
122 | $(SHARED_HEADERS)/kern_constants.h | ||
123 | 118 | ||
124 | archclean: | 119 | archclean: |
125 | @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ | 120 | @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ |
@@ -146,8 +141,4 @@ endef | |||
146 | include/generated/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s | 141 | include/generated/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s |
147 | $(call filechk,gen-asm-offsets) | 142 | $(call filechk,gen-asm-offsets) |
148 | 143 | ||
149 | $(SHARED_HEADERS)/kern_constants.h: | ||
150 | $(Q)mkdir -p $(dir $@) | ||
151 | $(Q)echo '#include <generated/asm-offsets.h>' >$@ | ||
152 | |||
153 | export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH | 144 | export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH |