diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-12 21:22:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-12 21:22:27 -0400 |
commit | 321d03c86732e45f5f33ad0db5b68e2e1364acb9 (patch) | |
tree | 19007efbd4ea1a09df9e3067d142ca2253fff266 /Makefile | |
parent | fd1232b214af43a973443aec6a2808f16ee5bf70 (diff) | |
parent | f23a9fa7e81f7df65e0bcf586e028a2db736b9e6 (diff) |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild changes from Michal Marek:
"Here is the non-critical part of kbuild:
- One bogus coccinelle check removed, one check fixed not to suggest
the obsolete PTR_RET macro
- scripts/tags.sh does not index the generated *.mod.c files
- new objdiff tool to list differences between two versions of an
object file
- A fix for scripts/bootgraph.pl"
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts/coccinelle: Use PTR_ERR_OR_ZERO
scripts/bootgraph.pl: Add graphic header
scripts: objdiff: detect object code changes between two commits
Coccicheck: Remove memcpy to struct assignment test
scripts/tags.sh: Ignore *.mod.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -428,8 +428,9 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve | |||
428 | 428 | ||
429 | # Files to ignore in find ... statements | 429 | # Files to ignore in find ... statements |
430 | 430 | ||
431 | RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ | 431 | export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ |
432 | -o -name .pc -o -name .hg -o -name .git \) -prune -o | 432 | -name CVS -o -name .pc -o -name .hg -o -name .git \) \ |
433 | -prune -o | ||
433 | export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \ | 434 | export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \ |
434 | --exclude CVS --exclude .pc --exclude .hg --exclude .git | 435 | --exclude CVS --exclude .pc --exclude .hg --exclude .git |
435 | 436 | ||
@@ -1103,7 +1104,7 @@ CLEAN_DIRS += $(MODVERDIR) | |||
1103 | 1104 | ||
1104 | # Directories & files removed with 'make mrproper' | 1105 | # Directories & files removed with 'make mrproper' |
1105 | MRPROPER_DIRS += include/config usr/include include/generated \ | 1106 | MRPROPER_DIRS += include/config usr/include include/generated \ |
1106 | arch/*/include/generated | 1107 | arch/*/include/generated .tmp_objdiff |
1107 | MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ | 1108 | MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ |
1108 | Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ | 1109 | Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ |
1109 | signing_key.priv signing_key.x509 x509.genkey \ | 1110 | signing_key.priv signing_key.x509 x509.genkey \ |