Skip to content

Commit

Permalink
kbuild: move compile.h to include/generated
Browse files Browse the repository at this point in the history
Signed-off-by: Sam Ravnborg <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
  • Loading branch information
sravnborg authored and michal42 committed Dec 12, 2009
1 parent f7f16b7 commit 9204595
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ Module.symvers
#
include/config
include/linux/autoconf.h
include/linux/compile.h
include/linux/version.h
include/linux/utsrelease.h
include/generated
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/boot/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ") "
Expand Down
8 changes: 2 additions & 6 deletions init/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)"
2 changes: 1 addition & 1 deletion init/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 9204595

Please sign in to comment.