From d0d38cd9e853db11e0242b3df4c9c3c4a663fbb4 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 11 Dec 2014 19:12:34 +0900 Subject: kbuild: use mixed-targets when two or more config targets are given "make kvmconfig" expects that the .config has already been created, but some people might want to create the .config and run kvmconfig in one shot command, like this: $ make defconfig kvmconfig To make sure this command works correctly even if -j* option is set, we must handle them one by one. This commit turns on mixed-targets when $(MAKECMDGOALS) includes at least one config target and also includes another target. Signed-off-by: Masahiro Yamada Signed-off-by: Michal Marek --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b1c3254441f3..dd3ecc0fb8e7 100644 --- a/Makefile +++ b/Makefile @@ -501,7 +501,7 @@ endif ifeq ($(KBUILD_EXTMOD),) ifneq ($(filter config %config,$(MAKECMDGOALS)),) config-targets := 1 - ifneq ($(filter-out config %config,$(MAKECMDGOALS)),) + ifneq ($(words $(MAKECMDGOALS)),1) mixed-targets := 1 endif endif -- cgit v1.2.3 From c22bd32c6663778841082a73ffc7a4cc183ddc8f Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 8 Jan 2015 17:29:38 +0900 Subject: kbuild: drop $(version_h) from MRPROPER_FILES Now $(version_h) is include/generated/uapi/linux/version.h. $(version_h) in MRPROPER_FILES is redundant because it is covered by include/generated in MRPROPER_DIRS. Signed-off-by: Masahiro Yamada Signed-off-by: Michal Marek --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dd3ecc0fb8e7..e71078b08b59 100644 --- a/Makefile +++ b/Makefile @@ -1171,7 +1171,7 @@ CLEAN_DIRS += $(MODVERDIR) # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config usr/include include/generated \ arch/*/include/generated .tmp_objdiff -MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ +MRPROPER_FILES += .config .config.old .version .old_version \ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ signing_key.priv signing_key.x509 x509.genkey \ extra_certificates signing_key.x509.keyid \ -- cgit v1.2.3