summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-04-26 23:33:37 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-05-03 10:04:59 -0400
commit1eaca4b982806b7554438a21831622128acebe82 (patch)
tree68bea34eef6bb93a750beae5ad1b565fbb0bc76f /Makefile
parentd93a18f27e3701a8cdc2228aee1c22451d1292e4 (diff)
kbuild: move Documentation to vmlinux-alldirs
A minor code cleanup. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 87ce8bef6e5c..85dd977f4232 100644
--- a/Makefile
+++ b/Makefile
@@ -989,8 +989,9 @@ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
989 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 989 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
990 $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y))) 990 $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y)))
991 991
992vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \ 992vmlinux-alldirs := $(sort $(vmlinux-dirs) Documentation \
993 $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-)))) 993 $(patsubst %/,%,$(filter %/, $(init-) $(core-) \
994 $(drivers-) $(net-) $(libs-) $(virt-))))
994 995
995init-y := $(patsubst %/, %/built-in.a, $(init-y)) 996init-y := $(patsubst %/, %/built-in.a, $(init-y))
996core-y := $(patsubst %/, %/built-in.a, $(core-y)) 997core-y := $(patsubst %/, %/built-in.a, $(core-y))
@@ -1007,7 +1008,7 @@ export KBUILD_VMLINUX_LIBS := $(libs-y1)
1007export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds 1008export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
1008export LDFLAGS_vmlinux 1009export LDFLAGS_vmlinux
1009# used by scripts/package/Makefile 1010# used by scripts/package/Makefile
1010export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include scripts tools) 1011export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch include scripts tools)
1011 1012
1012vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) 1013vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)
1013 1014
@@ -1361,7 +1362,7 @@ MRPROPER_FILES += .config .config.old .version \
1361# 1362#
1362clean: rm-dirs := $(CLEAN_DIRS) 1363clean: rm-dirs := $(CLEAN_DIRS)
1363clean: rm-files := $(CLEAN_FILES) 1364clean: rm-files := $(CLEAN_FILES)
1364clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation) 1365clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs))
1365 1366
1366PHONY += $(clean-dirs) clean archclean vmlinuxclean 1367PHONY += $(clean-dirs) clean archclean vmlinuxclean
1367$(clean-dirs): 1368$(clean-dirs):