summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-06-04 06:14:03 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-06-15 06:57:02 -0400
commitd5470d14431e9d39ee2131323589afac2a0bfee4 (patch)
tree525d6420912fd5280d8678c09b61e050bce82173 /Makefile
parent59b2bd05f5f4dc62979c2e82ddd384f07e8f10bc (diff)
kbuild: re-implement Makefile.headersinst without recursion
Since commit fcc8487d477a ("uapi: export all headers under uapi directories"), the headers in uapi directories are all exported by default although exceptional cases are still allowed by the syntax 'no-export-headers'. The traditional directory descending has been kept (in a somewhat hacky way), but it is actually unneeded. Get rid of it to simplify the code. Also, handle files one by one instead of the previous per-directory processing. This will emit much more log, but I like it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 11445a7dd820..507ce2c92065 100644
--- a/Makefile
+++ b/Makefile
@@ -1194,13 +1194,13 @@ PHONY += headers
1194headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts 1194headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts
1195 $(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/Kbuild),, \ 1195 $(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/Kbuild),, \
1196 $(error Headers not exportable for the $(SRCARCH) architecture)) 1196 $(error Headers not exportable for the $(SRCARCH) architecture))
1197 $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include 1197 $(Q)$(MAKE) $(hdr-inst)=include/uapi
1198 $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi dst=include 1198 $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi
1199 1199
1200PHONY += headers_check 1200PHONY += headers_check
1201headers_check: headers 1201headers_check: headers
1202 $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1 1202 $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1
1203 $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi dst=include HDRCHECK=1 1203 $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi HDRCHECK=1
1204 1204
1205ifdef CONFIG_HEADERS_INSTALL 1205ifdef CONFIG_HEADERS_INSTALL
1206prepare: headers 1206prepare: headers