Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 92045954058671fdd0ccf031ca06611ce1d929d1

Authored by Sam Ravnborg
Committed by Michal Marek
1 parent f7f16b7799
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

kbuild: move compile.h to include/generated 

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>

Showing 4 changed files with 4 additions and 9 deletions Side-by-side Diff

... ... @@ -47,7 +47,6 @@
47 47 #
48 48 include/config
49 49 include/linux/autoconf.h
50   -include/linux/compile.h
51 50 include/linux/version.h
52 51 include/linux/utsrelease.h
53 52 include/generated
arch/x86/boot/version.c
Diff comments   View file @ 9204595
... ... @@ -14,7 +14,7 @@
14 14  
15 15 #include "boot.h"
16 16 #include <linux/utsrelease.h>
17   -#include <linux/compile.h>
  17 +#include <generated/compile.h>
18 18  
19 19 const char kernel_version[] =
20 20 UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
... ... @@ -15,13 +15,9 @@
15 15 mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o
16 16 mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o
17 17  
18   -# files to be removed upon make clean
19   -clean-files := ../include/linux/compile.h
20   -
21 18 # dependencies on generated files need to be listed explicitly
  19 +$(obj)/version.o: include/generated/compile.h
22 20  
23   -$(obj)/version.o: include/linux/compile.h
24   -
25 21 # compile.h changes depending on hostname, generation number, etc,
26 22 # so we regenerate it always.
27 23 # mkcompile_h will make sure to only update the
... ... @@ -30,7 +26,7 @@
30 26 chk_compile.h = :
31 27 quiet_chk_compile.h = echo ' CHK $@'
32 28 silent_chk_compile.h = :
33   -include/linux/compile.h: FORCE
  29 +include/generated/compile.h: FORCE
34 30 @$($(quiet)chk_compile.h)
35 31 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
36 32 "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
... ... @@ -6,7 +6,7 @@
6 6 * May be freely distributed as part of Linux.
7 7 */
8 8  
9   -#include <linux/compile.h>
  9 +#include <generated/compile.h>
10 10 #include <linux/module.h>
11 11 #include <linux/uts.h>
12 12 #include <linux/utsname.h>