diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-05-17 22:35:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-05-17 22:35:55 -0700 |
| commit | 14dc73970edc8d94a299571ef364cf88558ef8fe (patch) | |
| tree | 69953c36222e55611ef8497eae4f5a69786ef8f7 | |
| parent | 29dcdeb6385625b539ef8261469b26c3104f6c92 (diff) | |
| parent | e90d139d12a55dbe5212a32859937ce5b2ba8e37 (diff) | |
Merge "Makefile.headersinst: remove destination-y option"
| -rw-r--r-- | Documentation/kbuild/makefiles.txt | 19 | ||||
| -rw-r--r-- | scripts/Makefile.headersinst | 2 |
2 files changed, 3 insertions, 18 deletions
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 13f888a02a3d..2ab3294ed8d1 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -45,8 +45,7 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y + --- 7.3 generic-y === 8 Kbuild Variables === 9 Makefile language @@ -1278,21 +1277,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index ed95cb4e515f..88aff66f88d8 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) |