diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-17 13:25:44 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-17 13:25:44 +0200 |
| commit | 3c5994c83895c89d344f24a86276f00d308e142b (patch) | |
| tree | 06d0040a24ec46512a630b967ef6f6c7fd5f4092 | |
| parent | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| download | linux-3c5994c83895c89d344f24a86276f00d308e142b.tar.xz linux-3c5994c83895c89d344f24a86276f00d308e142b.zip | |
uapi: Allow automatic generation of uapi/asm/ header files
Several arch/*/include/uapi/asm/* header simply include the
corresponding <asm-generic/*> file. This patch allows such files to be
specified in uapi/asm/Kbuild via "generic-y += ..." to be automatically
generated (similar to asm/Kbuild).
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | scripts/Makefile.asm-generic | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -437,7 +437,9 @@ endif PHONY += asm-generic asm-generic: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ - obj=arch/$(SRCARCH)/include/generated/asm + src=asm obj=arch/$(SRCARCH)/include/generated/asm + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ + src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm # To make sure we do not include .config for any of the *config targets # catch them early, and hand them over to scripts/kconfig/Makefile diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic index 40caf3c26cd5..d17e0ea911ed 100644 --- a/scripts/Makefile.asm-generic +++ b/scripts/Makefile.asm-generic @@ -5,7 +5,7 @@ # and for each file listed in this file with generic-y creates # a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm) -kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild +kbuild-file := $(srctree)/arch/$(SRCARCH)/include/$(src)/Kbuild -include $(kbuild-file) include scripts/Kbuild.include |