Merge branch 'sony' into release

[mirror_ubuntu-bionic-kernel.git] / init / Makefile

diff --git a/init/Makefile b/init/Makefile
index 633392f5cdeeb92e142db1f312e1e32d2a3a9176..0bf677aa0872f8c9f61c411b5adb6f1c395a8910 100644 (file)
--- a/init/Makefile
+++ b/init/Makefile
@@ -15,19 +15,18 @@ 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.
 # mkcompile_h will make sure to only update the
 # actual file if its content has changed.
 
-include/linux/compile.h: FORCE
-       @echo '  CHK     $@'
+       chk_compile.h = :
+ quiet_chk_compile.h = echo '  CHK     $@'
+silent_chk_compile.h = :
+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)"