aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-21 18:55:26 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-21 18:55:26 -0400
commiteddecbb601c9ea3fab7e67d7892010fc9426d1e6 (patch)
tree4bfa4740ae554e5c5a8468e74b39531a6153ce9f /Makefile
parent0bf8c869701039b12c3520cb1bb1689595ab108b (diff)
parentf2c23f65f63fe0dd83fc94efdfae0364c74458b8 (diff)
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: Make DEBUG_SECTION_MISMATCH selectable, but not on by default genksyms: Regenerate lexer and parser genksyms: Track changes to enum constants genksyms: simplify usage of find_symbol() genksyms: Add helpers for building string lists genksyms: Simplify printing of symbol types genksyms: Simplify lexer genksyms: Do not paste the bison header file to lex.c modpost: fix trailing comma KBuild: silence "'scripts/unifdef' is up to date." kbuild: Add extra gcc checks kbuild: reenable section mismatch analysis unifdef: update to upstream version 2.5
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9193f94ddf8..7d4e9c8da72 100644
--- a/Makefile
+++ b/Makefile
@@ -102,6 +102,10 @@ ifeq ("$(origin O)", "command line")
102 KBUILD_OUTPUT := $(O) 102 KBUILD_OUTPUT := $(O)
103endif 103endif
104 104
105ifeq ("$(origin W)", "command line")
106 export KBUILD_ENABLE_EXTRA_GCC_CHECKS := 1
107endif
108
105# That's our default target when none is given on the command line 109# That's our default target when none is given on the command line
106PHONY := _all 110PHONY := _all
107_all: 111_all:
@@ -1018,7 +1022,7 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
1018 1022
1019PHONY += __headers 1023PHONY += __headers
1020__headers: include/linux/version.h scripts_basic FORCE 1024__headers: include/linux/version.h scripts_basic FORCE
1021 $(Q)$(MAKE) $(build)=scripts scripts/unifdef 1025 $(Q)$(MAKE) $(build)=scripts build_unifdef
1022 1026
1023PHONY += headers_install_all 1027PHONY += headers_install_all
1024headers_install_all: 1028headers_install_all:
@@ -1263,6 +1267,7 @@ help:
1263 @echo ' make O=dir [targets] Locate all output files in "dir", including .config' 1267 @echo ' make O=dir [targets] Locate all output files in "dir", including .config'
1264 @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)' 1268 @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'
1265 @echo ' make C=2 [targets] Force check of all c source with $$CHECK' 1269 @echo ' make C=2 [targets] Force check of all c source with $$CHECK'
1270 @echo ' make W=1 [targets] Enable extra gcc checks'
1266 @echo '' 1271 @echo ''
1267 @echo 'Execute "make" or "make all" to build all targets marked with [*] ' 1272 @echo 'Execute "make" or "make all" to build all targets marked with [*] '
1268 @echo 'For further info see the ./README file' 1273 @echo 'For further info see the ./README file'