Makefile | 13 +++++-------- scripts/kconfig/Makefile | 18 ------------------ 2 files changed, 5 insertions(+), 26 deletions(-) --- linux-2.6.36-rc6-tmb0.5/scripts/kconfig/Makefile.orig 2010-09-29 15:13:10.000000000 +0300 +++ linux-2.6.36-rc6-tmb0.5/scripts/kconfig/Makefile 2010-09-29 15:15:46.102172862 +0300 @@ -12,26 +12,18 @@ Kconfig := arch/$(SRCARCH)/Kconfig endif xconfig: $(obj)/qconf 3rdparty/Makefile - $< $(Kconfig) gconfig: $(obj)/gconf 3rdparty/Makefile - $< $(Kconfig) menuconfig: $(obj)/mconf 3rdparty/Makefile - $< $(Kconfig) config: $(obj)/conf 3rdparty/Makefile - $< --oldaskconfig $(Kconfig) nconfig: $(obj)/nconf 3rdparty/Makefile - $< $(Kconfig) oldconfig: $(obj)/conf 3rdparty/Makefile - $< --$@ $(Kconfig) silentoldconfig: $(obj)/conf 3rdparty/Makefile - $(Q)mkdir -p include/generated - $< --$@ $(Kconfig) # if no path is given, then use src directory to find file ifdef LSMOD @@ -98,26 +90,16 @@ update-po-config: $(obj)/kxgettext $(obj PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile - $< --$@ $(Kconfig) PHONY += listnewconfig oldnoconfig savedefconfig defconfig listnewconfig oldnoconfig: $(obj)/conf 3rdparty/Makefile - $< --$@ $(Kconfig) savedefconfig: $(obj)/conf 3rdparty/Makefile - $< --$@=defconfig $(Kconfig) defconfig: $(obj)/conf 3rdparty/Makefile -ifeq ($(KBUILD_DEFCONFIG),) - $< --defconfig $(Kconfig) -else - @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) -endif %_defconfig: $(obj)/conf 3rdparty/Makefile - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) # Help text used by make help help: --- linux-2.6.37-rc3-git2-tmb0.1/Makefile.orig 2010-11-25 16:32:08.990171957 +0200 +++ linux-2.6.37-rc3-git2-tmb0.1/Makefile 2010-11-25 16:36:18.267763659 +0200 @@ -481,8 +481,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 - $(Q)$(MAKE) $(build)=$(@) +scripts: # Objects we will link into vmlinux / subdirs we need to visit init-y := init/ @@ -955,7 +954,7 @@ prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=. missing-syscalls # All the preparing.. -prepare: prepare0 +prepare: # Generate some files # --------------------------------------------------------------------------- @@ -1131,10 +1130,8 @@ CLEAN_FILES += vmlinux System.map \ .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map # Directories & files removed with 'make mrproper' -MRPROPER_DIRS += include/config usr/include include/generated -MRPROPER_FILES += .config .config.old .version .old_version \ - include/linux/version.h \ - Module.symvers tags TAGS cscope* +MRPROPER_DIRS += "" +MRPROPER_FILES += "" # clean - Delete most, but leave enough to build external modules # @@ -1152,7 +1149,7 @@ clean: archclean # 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):