diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 12:17:50 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 12:17:50 -0700 |
| commit | d13a822e6d08733cc69dd8c2f5d82eacb1474295 (patch) | |
| tree | 2b39613c0d8cce9eb3b15adb1525a2c72f46d392 /Makefile | |
| parent | 29d679ffd850ea37a303bb930142be14982611e4 (diff) | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
| download | lwn-d13a822e6d08733cc69dd8c2f5d82eacb1474295.tar.gz lwn-d13a822e6d08733cc69dd8c2f5d82eacb1474295.zip | |
Merge commit 'v3.4' into x86/urgent
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -rc6 +EXTRAVERSION = NAME = Saber-toothed Squirrel # *DOCUMENTATION* @@ -442,7 +442,7 @@ asm-generic: no-dot-config-targets := clean mrproper distclean \ cscope gtags TAGS tags help %docs check% coccicheck \ - include/linux/version.h headers_% archheaders \ + include/linux/version.h headers_% archheaders archscripts \ kernelversion %src-pkg config-targets := 0 @@ -979,7 +979,7 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \ include/config/auto.conf $(cmd_crmodverdir) -archprepare: archheaders prepare1 scripts_basic +archprepare: archheaders archscripts prepare1 scripts_basic prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=. @@ -1049,8 +1049,11 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) PHONY += archheaders archheaders: +PHONY += archscripts +archscripts: + PHONY += __headers -__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE +__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE $(Q)$(MAKE) $(build)=scripts build_unifdef PHONY += headers_install_all |