diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-04 08:32:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-04 08:32:52 +0200 |
| commit | 43c1881110b28f42c58d45465a6b8cad06540ad0 (patch) | |
| tree | 4b964b15e2ed7e6acd6e375c39e575348fd988a2 /Makefile | |
| parent | 849e910d07a2e6d9f1e8562f2d6ce1adf0034c51 (diff) | |
| parent | 81d2b141e709505fcdf9a6c4df160894ddf28667 (diff) | |
| download | barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.gz barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -349,7 +349,7 @@ endif no-dot-config-targets := clean mrproper distclean \ cscope TAGS tags help %docs check% \ - include/linux/version.h headers_% \ + include/generated/version.h headers_% \ kernelrelease kernelversion config-targets := 0 @@ -796,7 +796,7 @@ endif # prepare2 creates a makefile if using a separate output directory prepare2: prepare3 outputmakefile -prepare1: prepare2 include/linux/version.h include/linux/utsrelease.h \ +prepare1: prepare2 include/generated/version.h include/generated/utsrelease.h \ include/asm include/config.h include/config/auto.conf ifneq ($(KBUILD_MODULES),) @@ -879,10 +879,10 @@ define filechk_version.h echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) endef -include/linux/version.h: $(srctree)/Makefile FORCE +include/generated/version.h: $(srctree)/Makefile FORCE $(call filechk,version.h) -include/linux/utsrelease.h: include/config/kernel.release FORCE +include/generated/utsrelease.h: include/config/kernel.release FORCE $(call filechk,utsrelease.h) # --------------------------------------------------------------------------- @@ -971,15 +971,15 @@ endif # CONFIG_MODULES # Directories & files removed with 'make clean' CLEAN_DIRS += $(MODVERDIR) -CLEAN_FILES += barebox System.map include/barebox_default_env.h \ +CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \ .tmp_version .tmp_barebox* barebox.bin barebox.S \ .tmp_kallsyms* barebox_default_env barebox.ldr # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include2 usr/include MRPROPER_FILES += .config .config.old include/asm .version .old_version \ - include/generated/autoconf.h include/linux/version.h \ - include/linux/utsrelease.h include/config.h \ + include/generated/autoconf.h include/generated/version.h \ + include/generated/utsrelease.h include/config.h \ Module.symvers tags TAGS cscope* # clean - Delete most, but leave enough to build external modules |