From: Sam Ravnborg <sam@ravnborg.org>
To: kbuild <linux-kbuild@vger.kernel.org>,
lkml <linux-kernel@vger.kernel.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH 11/14] kbuild: move compile.h to include/generated
Date: Sun, 18 Oct 2009 10:15:20 +0200 [thread overview]
Message-ID: <1255853723-477-11-git-send-email-sam@ravnborg.org> (raw)
In-Reply-To: <20091018080635.GA13767@merkur.ravnborg.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
.gitignore | 1 -
arch/x86/boot/version.c | 2 +-
init/Makefile | 8 ++------
init/version.c | 2 +-
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index 624e3ab..0f594d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,6 @@ Module.symvers
#
include/config
include/linux/autoconf.h
-include/linux/compile.h
include/linux/version.h
include/linux/utsrelease.h
include/generated
diff --git a/arch/x86/boot/version.c b/arch/x86/boot/version.c
index 2723d9b..4d88763 100644
--- a/arch/x86/boot/version.c
+++ b/arch/x86/boot/version.c
@@ -14,7 +14,7 @@
#include "boot.h"
#include <linux/utsrelease.h>
-#include <linux/compile.h>
+#include <generated/compile.h>
const char kernel_version[] =
UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
diff --git a/init/Makefile b/init/Makefile
index 4a243df..0bf677a 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -15,12 +15,8 @@ mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o
mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o
mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o
-# files to be removed upon make clean
-clean-files := ../include/linux/compile.h
-
# dependencies on generated files need to be listed explicitly
-
-$(obj)/version.o: include/linux/compile.h
+$(obj)/version.o: include/generated/compile.h
# compile.h changes depending on hostname, generation number, etc,
# so we regenerate it always.
@@ -30,7 +26,7 @@ $(obj)/version.o: include/linux/compile.h
chk_compile.h = :
quiet_chk_compile.h = echo ' CHK $@'
silent_chk_compile.h = :
-include/linux/compile.h: FORCE
+include/generated/compile.h: FORCE
@$($(quiet)chk_compile.h)
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
diff --git a/init/version.c b/init/version.c
index 52a8b98..82328aa 100644
--- a/init/version.c
+++ b/init/version.c
@@ -6,7 +6,7 @@
* May be freely distributed as part of Linux.
*/
-#include <linux/compile.h>
+#include <generated/compile.h>
#include <linux/module.h>
#include <linux/uts.h>
#include <linux/utsname.h>
--
1.6.2.5
next prev parent reply other threads:[~2009-10-18 8:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-18 8:06 [PATCH 0/14 v2] kbuild: Move files " Sam Ravnborg
2009-10-18 8:15 ` [PATCH 01/14] kbuild: search arch/$ARCH/include before include/ Sam Ravnborg
2009-10-18 8:15 ` [PATCH 02/14] dontdiff: add generated Sam Ravnborg
2009-10-18 8:15 ` [PATCH 03/14] kbuild: move bounds.h to include/generated Sam Ravnborg
2009-10-18 8:15 ` [PATCH 04/14] kbuild: move asm-offsets.h " Sam Ravnborg
2009-10-18 8:15 ` [PATCH 05/14] ia64: move nr-irqs.h " Sam Ravnborg
2009-10-18 8:15 ` [PATCH 06/14] arm: move mach-types " Sam Ravnborg
2009-10-18 8:15 ` [PATCH 07/14] sh: move machtypes.h " Sam Ravnborg
2009-10-18 8:15 ` [PATCH 08/14] kbuild: drop include2/ used for O=... builds Sam Ravnborg
2009-10-18 8:15 ` [PATCH 09/14] kbuild: do not check for include/asm-$ARCH Sam Ravnborg
2009-10-18 8:15 ` [PATCH 10/14] kbuild: drop include/asm Sam Ravnborg
2009-10-18 8:15 ` Sam Ravnborg [this message]
2009-10-18 8:15 ` [PATCH 12/14] drop explicit include of autoconf.h Sam Ravnborg
2009-10-18 8:15 ` [PATCH 13/14] kbuild: move autoconf.h to include/generated Sam Ravnborg
2009-11-25 14:28 ` Michal Marek
2009-10-18 8:15 ` [PATCH 14/14] kbuild: move utsrelease.h " Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1255853723-477-11-git-send-email-sam@ravnborg.org \
--to=sam@ravnborg.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome