aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-27 07:43:36 -0400
committerMichal Marek <mmarek@suse.cz>2015-04-02 10:42:08 -0400
commita436bb7b806383ae0593cab53d17fc9676270cd3 (patch)
tree4d51b1a8b5474fd0d3000f5026032efc71a961b0 /arch/um
parent7aacad53aeb57b7ff52399f56eb6d7d4010e72e9 (diff)
kbuild: use relative path more to include Makefile
Prior to this commit, it was impossible to use relative path to include Makefiles from the top level Makefile because the option "--include-dir=$(srctree)" becomes effective when Make enters into sub Makefiles. To use relative path in any places, this commit moves the option above the "sub-make" target. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index e4b1a9639c4d..17d4460b1af3 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -43,8 +43,8 @@ endif
43 43
44HOST_DIR := arch/$(HEADER_ARCH) 44HOST_DIR := arch/$(HEADER_ARCH)
45 45
46include $(srctree)/$(ARCH_DIR)/Makefile-skas 46include $(ARCH_DIR)/Makefile-skas
47include $(srctree)/$(HOST_DIR)/Makefile.um 47include $(HOST_DIR)/Makefile.um
48 48
49core-y += $(HOST_DIR)/um/ 49core-y += $(HOST_DIR)/um/
50 50
@@ -73,7 +73,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
73 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include 73 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
74 74
75#This will adjust *FLAGS accordingly to the platform. 75#This will adjust *FLAGS accordingly to the platform.
76include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) 76include $(ARCH_DIR)/Makefile-os-$(OS)
77 77
78KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \ 78KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \
79 -I$(srctree)/$(HOST_DIR)/include/uapi \ 79 -I$(srctree)/$(HOST_DIR)/include/uapi \