aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 21:41:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 21:41:27 -0500
commitdede6faac448db4251f8996d7dec6afb5a43726a (patch)
treedcf34d731bc4626b9e232151acee3673da84adaf /Makefile
parent21404b772a1c65f7b935b8c0fddc388a949f4e31 (diff)
parent5f7efb4c6da9f90cb306923ced2a6494d065a595 (diff)
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: Kbuild: append missing-syscalls to the default target list genksyms: Regenerate lexer and parser genksyms: Do not expand internal types genksyms: Minor parser cleanup Makefile: remove a duplicated line fixdep: fix extraneous dependencies scripts/Makefile.build: do not reference EXTRA_CFLAGS as CFLAGS replacement kbuild: prevent make from deleting _shipped files kbuild: Do not delete empty files in make distclean
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 07bc92544e9c..ed25c5b35470 100644
--- a/Makefile
+++ b/Makefile
@@ -983,7 +983,6 @@ archprepare: prepare1 scripts_basic
983 983
984prepare0: archprepare FORCE 984prepare0: archprepare FORCE
985 $(Q)$(MAKE) $(build)=. 985 $(Q)$(MAKE) $(build)=.
986 $(Q)$(MAKE) $(build)=. missing-syscalls
987 986
988# All the preparing.. 987# All the preparing..
989prepare: prepare0 988prepare: prepare0
@@ -1198,7 +1197,7 @@ distclean: mrproper
1198 @find $(srctree) $(RCS_FIND_IGNORE) \ 1197 @find $(srctree) $(RCS_FIND_IGNORE) \
1199 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ 1198 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
1200 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ 1199 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
1201 -o -name '.*.rej' -o -size 0 \ 1200 -o -name '.*.rej' \
1202 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ 1201 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
1203 -type f -print | xargs rm -f 1202 -type f -print | xargs rm -f
1204 1203
@@ -1296,7 +1295,6 @@ help:
1296 @echo ' 2: warnings which occur quite often but may still be relevant' 1295 @echo ' 2: warnings which occur quite often but may still be relevant'
1297 @echo ' 3: more obscure warnings, can most likely be ignored' 1296 @echo ' 3: more obscure warnings, can most likely be ignored'
1298 @echo ' Multiple levels can be combined with W=12 or W=123' 1297 @echo ' Multiple levels can be combined with W=12 or W=123'
1299 @echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
1300 @echo '' 1298 @echo ''
1301 @echo 'Execute "make" or "make all" to build all targets marked with [*] ' 1299 @echo 'Execute "make" or "make all" to build all targets marked with [*] '
1302 @echo 'For further info see the ./README file' 1300 @echo 'For further info see the ./README file'