Move include/linux/version.h to the UAPI header directory.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
---
Makefile | 10 +++++-----
include/linux/Kbuild | 1 -
uapi/linux/Kbuild | 3 +++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 7231c4b..3192b2e 100644
--- a/Makefile
+++ b/Makefile
@@ -451,7 +451,7 @@ asm-generic:
no-dot-config-targets := clean mrproper distclean \
cscope gtags TAGS tags help %docs check% coccicheck \
- include/linux/version.h headers_% \
+ uapi/linux/version.h headers_% \
kernelversion %src-pkg
config-targets := 0
@@ -984,7 +984,7 @@ endif
# prepare2 creates a makefile if using a separate output directory
prepare2: prepare3 outputmakefile asm-generic
-prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
+prepare1: prepare2 uapi/linux/version.h include/generated/utsrelease.h \
include/config/auto.conf
$(cmd_crmodverdir)
@@ -1018,7 +1018,7 @@ define filechk_version.h
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
endef
-include/linux/version.h: $(srctree)/Makefile FORCE
+uapi/linux/version.h: $(srctree)/Makefile FORCE
$(call filechk,version.h)
include/generated/utsrelease.h: include/config/kernel.release FORCE
@@ -1057,7 +1057,7 @@ hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
PHONY += __headers
-__headers: include/linux/version.h scripts_basic asm-generic FORCE
+__headers: uapi/linux/version.h scripts_basic asm-generic FORCE
$(Q)$(MAKE) $(build)=scripts build_unifdef
PHONY += headers_install_all
@@ -1176,7 +1176,7 @@ CLEAN_FILES += vmlinux System.map \
MRPROPER_DIRS += include/config usr/include include/generated \
arch/*/include/generated
MRPROPER_FILES += .config .config.old .version .old_version \
- include/linux/version.h \
+ uapi/linux/version.h \
Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
# clean - Delete most, but leave enough to build external modules
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 01f6362..f429b36 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -19,7 +19,6 @@ header-y += netfilter_ipv6/
header-y += usb/
header-y += wimax/
-objhdr-y += version.h
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
$(srctree)/include/asm-$(SRCARCH)/a.out.h \
diff --git a/uapi/linux/Kbuild b/uapi/linux/Kbuild
index b29b895..2731127 100644
--- a/uapi/linux/Kbuild
+++ b/uapi/linux/Kbuild
@@ -12,3 +12,6 @@ header-y += sunrpc/
header-y += netfilter/
header-y += usb/
header-y += wimax/
+
+objhdr-y += version.h
+
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
