History

kbuild: pass dst= to Makefile.headersinst from top Makefile

We can always pass dst= from the top Makefile. This will simplify the logic in Makefile.headersinst.

Masahiro Yamada committed 9 years ago

Commit a8ff49a1 parent 0f042ee2 files · +4 −8Browse files

Unified · Split

2 files
  1. Makefile +2 −2
  2. scripts/Makefile.headersinst +2 −6
Makefile+2−2
@@ -1154,7 +1154,7 @@ PHONY += headers_install · 1153 unmodified lines
1154headers_install: __headers1154headers_install: __headers
1155 $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \1155 $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \
1156 $(error Headers not exportable for the $(SRCARCH) architecture))1156 $(error Headers not exportable for the $(SRCARCH) architecture))
1157 $(Q)$(MAKE) $(hdr-inst)=include/uapi1157 $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include
1158 $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst)1158 $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst)
1159 1159
1160PHONY += headers_check_all1160PHONY += headers_check_all
@@ -1163,7 +1163,7 @@ headers_check_all: headers_install_all · 2 unmodified lines
1163 1163
1164PHONY += headers_check1164PHONY += headers_check
1165headers_check: headers_install1165headers_check: headers_install
1166 $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=11166 $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1
1167 $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) HDRCHECK=11167 $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) HDRCHECK=1
1168 1168
1169# ---------------------------------------------------------------------------1169# ---------------------------------------------------------------------------
scripts/Makefile.headersinst+2−6
@@ -23,15 +23,12 @@ subdirs := $(patsubst $(srcdir)/%/,%,\ · 22 unmodified lines
23 $(filter-out $(srcdir)/,\23 $(filter-out $(srcdir)/,\
24 $(sort $(dir $(wildcard $(srcdir)/*/)))))24 $(sort $(dir $(wildcard $(srcdir)/*/)))))
25 25
26# caller may set destination dir (when installing to asm/)
27_dst := $(if $(dst),$(dst),$(obj))
28
29# Recursion26# Recursion
30__headers: $(subdirs)27__headers: $(subdirs)
31 28
32.PHONY: $(subdirs)29.PHONY: $(subdirs)
33$(subdirs):30$(subdirs):
34 $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(_dst)/$@31 $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(dst)/$@
35 32
36# Skip header install/check for include/uapi and arch/$(hdr-arch)/include/uapi.33# Skip header install/check for include/uapi and arch/$(hdr-arch)/include/uapi.
37# We have only sub-directories there.34# We have only sub-directories there.
@@ -48,8 +45,7 @@ ifneq ($(wildcard $(old-kbuild-file)),) · 10 unmodified lines
48include $(old-kbuild-file)45include $(old-kbuild-file)
49endif46endif
50 47
51installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst))48installdir := $(INSTALL_HDR_PATH)/$(dst)
52
53gendir := $(objtree)/$(subst include/,include/generated/,$(obj))49gendir := $(objtree)/$(subst include/,include/generated/,$(obj))
54header-files := $(notdir $(wildcard $(srcdir)/*.h))50header-files := $(notdir $(wildcard $(srcdir)/*.h))
55header-files += $(notdir $(wildcard $(srcdir)/*.agh))51header-files += $(notdir $(wildcard $(srcdir)/*.agh))