summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-19 11:32:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-19 11:32:21 -0700
commit1bf99477226963d84b182b3995e355d3091199be (patch)
tree843f3e9a211b70dc8d66f505f1f13f6013f3de32 /Makefile
parent83e0c24a38aa91f7d932bbcab257093b82435074 (diff)
parent7d3cc8b6d899e53222c22a78d98bb53a695f7962 (diff)
downloadlinux-3.10-1bf99477226963d84b182b3995e355d3091199be.tar.gz
linux-3.10-1bf99477226963d84b182b3995e355d3091199be.tar.bz2
linux-3.10-1bf99477226963d84b182b3995e355d3091199be.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: Don't clean bounds.h and asm-offsets.h kconfig: incorrect 'len' field initialisation ? kernel-doc: allow unnamed bit-fields kbuild: filter away debug symbols from kernel symbols Remove *.rej pattern from .gitignore MAINTAINERS: document names of new kbuild trees kbuild: disable modpost warnings for linkonce sections kbuild: escape meta characters in regular expression in make TAGS
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f63884258ae..20b32351906 100644
--- a/Makefile
+++ b/Makefile
@@ -1114,6 +1114,7 @@ MRPROPER_DIRS += include/config include2 usr/include
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
include/linux/autoconf.h include/linux/version.h \
include/linux/utsrelease.h \
+ include/linux/bounds.h include/asm*/asm-offsets.h \
Module.symvers tags TAGS cscope*
# clean - Delete most, but leave enough to build external modules
@@ -1431,7 +1432,7 @@ define xtags
elif $1 --version 2>&1 | grep -iq emacs; then \
$(all-sources) | xargs $1 -a; \
$(all-kconfigs) | xargs $1 -a \
- --regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \
+ --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \
$(all-defconfigs) | xargs -r $1 -a \
--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
else \