Skip to content

Commit

Permalink
Makefile.headersinst: remove destination-y option
Browse files Browse the repository at this point in the history
This option was added in commit c7bb349 ("kbuild: introduce destination-y
for exported headers") but never used in-tree.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
  • Loading branch information
Nicolas Dichtel authored and Masahiro Yamada committed May 10, 2017
1 parent 7c025b2 commit bd73a32
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 20 deletions.
23 changes: 4 additions & 19 deletions Documentation/kbuild/makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ 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.5 generated-y
--- 7.3 generic-y
--- 7.4 generated-y

=== 8 Kbuild Variables
=== 9 Makefile language
Expand Down Expand Up @@ -1295,21 +1294,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
Expand All @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file.
Example: termios.h
#include <asm-generic/termios.h>

--- 7.5 generated-y
--- 7.4 generated-y

If an architecture generates other header files alongside generic-y
wrappers, and not included in genhdr-y, then generated-y specifies
Expand Down
2 changes: 1 addition & 1 deletion scripts/Makefile.headersinst
Original file line number Diff line number Diff line change
Expand Up @@ -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)),)
Expand Down

0 comments on commit bd73a32

Please sign in to comment.