diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 13:07:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 13:07:08 -0500 |
| commit | 27a22ee4c7d5839fd7e3e441c9d675c8a5c4c22c (patch) | |
| tree | 309fd7788b0695c5273416840d7a7a08dcecda5c /Makefile | |
| parent | b2b89ebfc0f0287e20516a5443d93af309b800cf (diff) | |
| parent | a75f8b8dab0f73459fa47a1daa10c84c4e8400a8 (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild updates from Michal Marek:
- several cleanups in kbuild
- serialize multiple *config targets so that 'make defconfig kvmconfig'
works
- The cc-ifversion macro got support for an else-branch
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild,gcov: simplify kernel/gcov/Makefile more
kbuild: allow cc-ifversion to have the argument for false condition
kbuild,gcov: simplify kernel/gcov/Makefile
kbuild,gcov: remove unnecessary workaround
kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion
kbuild: fix cc-ifversion macro
kbuild: drop $(version_h) from MRPROPER_FILES
kbuild: use mixed-targets when two or more config targets are given
kbuild: remove redundant line from bounds.h/asm-offsets.h
kbuild: merge bounds.h and asm-offsets.h rules
kbuild: Drop support for clean-rule
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -502,7 +502,7 @@ endif | |||
| 502 | ifeq ($(KBUILD_EXTMOD),) | 502 | ifeq ($(KBUILD_EXTMOD),) |
| 503 | ifneq ($(filter config %config,$(MAKECMDGOALS)),) | 503 | ifneq ($(filter config %config,$(MAKECMDGOALS)),) |
| 504 | config-targets := 1 | 504 | config-targets := 1 |
| 505 | ifneq ($(filter-out config %config,$(MAKECMDGOALS)),) | 505 | ifneq ($(words $(MAKECMDGOALS)),1) |
| 506 | mixed-targets := 1 | 506 | mixed-targets := 1 |
| 507 | endif | 507 | endif |
| 508 | endif | 508 | endif |
| @@ -1180,7 +1180,7 @@ CLEAN_DIRS += $(MODVERDIR) | |||
| 1180 | # Directories & files removed with 'make mrproper' | 1180 | # Directories & files removed with 'make mrproper' |
| 1181 | MRPROPER_DIRS += include/config usr/include include/generated \ | 1181 | MRPROPER_DIRS += include/config usr/include include/generated \ |
| 1182 | arch/*/include/generated .tmp_objdiff | 1182 | arch/*/include/generated .tmp_objdiff |
| 1183 | MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ | 1183 | MRPROPER_FILES += .config .config.old .version .old_version \ |
| 1184 | Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ | 1184 | Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ |
| 1185 | signing_key.priv signing_key.x509 x509.genkey \ | 1185 | signing_key.priv signing_key.x509 x509.genkey \ |
| 1186 | extra_certificates signing_key.x509.keyid \ | 1186 | extra_certificates signing_key.x509.keyid \ |