Makefile | 17 +++++------------ scripts/kconfig/Makefile | 23 ----------------------- 2 files changed, 5 insertions(+), 35 deletions(-) diff -Nurp linux-4.4.7-mga1/Makefile linux-4.4.7-mga1-mrproper/Makefile --- linux-4.4.7-mga1/Makefile 2016-04-12 19:49:25.607028071 +0300 +++ linux-4.4.7-mga1-mrproper/Makefile 2016-04-12 19:50:54.027047346 +0300 @@ -540,9 +540,7 @@ ifeq ($(KBUILD_EXTMOD),) # Carefully list dependencies so we do not try to build scripts twice # in parallel PHONY += scripts -scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \ - asm-generic - $(Q)$(MAKE) $(build)=$(@) +scripts: # Objects we will link into vmlinux / subdirs we need to visit init-y := init/ @@ -986,7 +984,7 @@ prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=. # All the preparing.. -prepare: prepare0 +prepare: # Generate some files # --------------------------------------------------------------------------- @@ -1171,13 +1169,8 @@ endif # CONFIG_MODULES 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 \ - Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ - signing_key.pem signing_key.priv signing_key.x509 \ - x509.genkey extra_certificates signing_key.x509.keyid \ - signing_key.x509.signer vmlinux-gdb.py +MRPROPER_DIRS += "" +MRPROPER_FILES += "" # clean - Delete most, but leave enough to build external modules # @@ -1198,7 +1191,7 @@ clean: archclean vmlinuxclean # mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) -mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts) +mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook) PHONY += $(mrproper-dirs) mrproper archmrproper $(mrproper-dirs): diff -Nurp linux-4.4.7-mga1/scripts/kconfig/Makefile linux-4.4.7-mga1-mrproper/scripts/kconfig/Makefile --- linux-4.4.7-mga1/scripts/kconfig/Makefile 2016-04-12 19:49:25.607028071 +0300 +++ linux-4.4.7-mga1-mrproper/scripts/kconfig/Makefile 2016-04-12 19:51:49.180055656 +0300 @@ -19,23 +19,16 @@ endif unexport CONFIG_ xconfig: $(obj)/qconf 3rdparty/Makefile - $< $(silent) $(Kconfig) gconfig: $(obj)/gconf 3rdparty/Makefile - $< $(silent) $(Kconfig) menuconfig: $(obj)/mconf 3rdparty/Makefile - $< $(silent) $(Kconfig) config: $(obj)/conf 3rdparty/Makefile - $< $(silent) --oldaskconfig $(Kconfig) nconfig: $(obj)/nconf 3rdparty/Makefile - $< $(silent) $(Kconfig) silentoldconfig: $(obj)/conf 3rdparty/Makefile - $(Q)mkdir -p include/config include/generated - $< $(silent) --$@ $(Kconfig) localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile $(Q)mkdir -p include/config include/generated @@ -81,7 +74,6 @@ simple-targets := oldconfig allnoconfig PHONY += $(simple-targets) $(simple-targets): $(obj)/conf 3rdparty/Makefile - $< $(silent) --$@ $(Kconfig) PHONY += oldnoconfig savedefconfig defconfig @@ -91,23 +83,8 @@ PHONY += oldnoconfig savedefconfig defco oldnoconfig: olddefconfig 3rdparty/Makefile savedefconfig: $(obj)/conf 3rdparty/Makefile - $< $(silent) --$@=defconfig $(Kconfig) - -defconfig: $(obj)/conf 3rdparty/Makefile -ifeq ($(KBUILD_DEFCONFIG),) - $< $(silent) --defconfig $(Kconfig) -else -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),) - @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) -else - @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'" - $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG) -endif -endif %_defconfig: $(obj)/conf 3rdparty/Makefile - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
