| 1 |
tmb |
61100 |
|
| 2 |
|
|
Makefile | 13 +++++-------- |
| 3 |
|
|
scripts/kconfig/Makefile | 18 ------------------ |
| 4 |
|
|
2 files changed, 5 insertions(+), 26 deletions(-) |
| 5 |
|
|
|
| 6 |
|
|
--- linux-2.6.36-rc6-tmb0.5/scripts/kconfig/Makefile.orig 2010-09-29 15:13:10.000000000 +0300 |
| 7 |
|
|
+++ linux-2.6.36-rc6-tmb0.5/scripts/kconfig/Makefile 2010-09-29 15:15:46.102172862 +0300 |
| 8 |
|
|
@@ -12,26 +12,18 @@ Kconfig := arch/$(SRCARCH)/Kconfig |
| 9 |
|
|
endif |
| 10 |
|
|
|
| 11 |
|
|
xconfig: $(obj)/qconf 3rdparty/Makefile |
| 12 |
|
|
- $< $(Kconfig) |
| 13 |
|
|
|
| 14 |
|
|
gconfig: $(obj)/gconf 3rdparty/Makefile |
| 15 |
|
|
- $< $(Kconfig) |
| 16 |
|
|
|
| 17 |
|
|
menuconfig: $(obj)/mconf 3rdparty/Makefile |
| 18 |
|
|
- $< $(Kconfig) |
| 19 |
|
|
|
| 20 |
|
|
config: $(obj)/conf 3rdparty/Makefile |
| 21 |
|
|
- $< --oldaskconfig $(Kconfig) |
| 22 |
|
|
|
| 23 |
|
|
nconfig: $(obj)/nconf 3rdparty/Makefile |
| 24 |
|
|
- $< $(Kconfig) |
| 25 |
|
|
|
| 26 |
|
|
oldconfig: $(obj)/conf 3rdparty/Makefile |
| 27 |
|
|
- $< --$@ $(Kconfig) |
| 28 |
|
|
|
| 29 |
|
|
silentoldconfig: $(obj)/conf 3rdparty/Makefile |
| 30 |
|
|
- $(Q)mkdir -p include/generated |
| 31 |
|
|
- $< --$@ $(Kconfig) |
| 32 |
|
|
|
| 33 |
|
|
# if no path is given, then use src directory to find file |
| 34 |
|
|
ifdef LSMOD |
| 35 |
|
|
@@ -98,26 +90,16 @@ update-po-config: $(obj)/kxgettext $(obj |
| 36 |
|
|
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig |
| 37 |
|
|
|
| 38 |
|
|
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile |
| 39 |
|
|
- $< --$@ $(Kconfig) |
| 40 |
|
|
|
| 41 |
|
|
PHONY += listnewconfig oldnoconfig savedefconfig defconfig |
| 42 |
|
|
|
| 43 |
|
|
listnewconfig oldnoconfig: $(obj)/conf 3rdparty/Makefile |
| 44 |
|
|
- $< --$@ $(Kconfig) |
| 45 |
|
|
|
| 46 |
|
|
savedefconfig: $(obj)/conf 3rdparty/Makefile |
| 47 |
|
|
- $< --$@=defconfig $(Kconfig) |
| 48 |
|
|
|
| 49 |
|
|
defconfig: $(obj)/conf 3rdparty/Makefile |
| 50 |
|
|
-ifeq ($(KBUILD_DEFCONFIG),) |
| 51 |
|
|
- $< --defconfig $(Kconfig) |
| 52 |
|
|
-else |
| 53 |
|
|
- @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" |
| 54 |
|
|
- $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) |
| 55 |
|
|
-endif |
| 56 |
|
|
|
| 57 |
|
|
%_defconfig: $(obj)/conf 3rdparty/Makefile |
| 58 |
|
|
- $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) |
| 59 |
|
|
|
| 60 |
|
|
# Help text used by make help |
| 61 |
|
|
help: |
| 62 |
|
|
--- linux-2.6.37-rc3-git2-tmb0.1/Makefile.orig 2010-11-25 16:32:08.990171957 +0200 |
| 63 |
|
|
+++ linux-2.6.37-rc3-git2-tmb0.1/Makefile 2010-11-25 16:36:18.267763659 +0200 |
| 64 |
|
|
@@ -481,8 +481,7 @@ ifeq ($(KBUILD_EXTMOD),) |
| 65 |
|
|
# Carefully list dependencies so we do not try to build scripts twice |
| 66 |
|
|
# in parallel |
| 67 |
|
|
PHONY += scripts |
| 68 |
|
|
-scripts: scripts_basic include/config/auto.conf include/config/tristate.conf |
| 69 |
|
|
- $(Q)$(MAKE) $(build)=$(@) |
| 70 |
|
|
+scripts: |
| 71 |
|
|
|
| 72 |
|
|
# Objects we will link into vmlinux / subdirs we need to visit |
| 73 |
|
|
init-y := init/ |
| 74 |
|
|
@@ -955,7 +954,7 @@ prepare0: archprepare FORCE |
| 75 |
|
|
$(Q)$(MAKE) $(build)=. missing-syscalls |
| 76 |
|
|
|
| 77 |
|
|
# All the preparing.. |
| 78 |
|
|
-prepare: prepare0 |
| 79 |
|
|
+prepare: |
| 80 |
|
|
|
| 81 |
|
|
# Generate some files |
| 82 |
|
|
# --------------------------------------------------------------------------- |
| 83 |
|
|
@@ -1131,10 +1130,8 @@ CLEAN_FILES += vmlinux System.map \ |
| 84 |
|
|
.tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map |
| 85 |
|
|
|
| 86 |
|
|
# Directories & files removed with 'make mrproper' |
| 87 |
|
|
-MRPROPER_DIRS += include/config usr/include include/generated |
| 88 |
|
|
-MRPROPER_FILES += .config .config.old .version .old_version \ |
| 89 |
|
|
- include/linux/version.h \ |
| 90 |
|
|
- Module.symvers tags TAGS cscope* |
| 91 |
|
|
+MRPROPER_DIRS += "" |
| 92 |
|
|
+MRPROPER_FILES += "" |
| 93 |
|
|
|
| 94 |
|
|
# clean - Delete most, but leave enough to build external modules |
| 95 |
|
|
# |
| 96 |
|
|
@@ -1152,7 +1149,7 @@ clean: archclean |
| 97 |
|
|
# |
| 98 |
|
|
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) |
| 99 |
|
|
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) |
| 100 |
|
|
-mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts) |
| 101 |
|
|
+mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook) |
| 102 |
|
|
|
| 103 |
|
|
PHONY += $(mrproper-dirs) mrproper archmrproper |
| 104 |
|
|
$(mrproper-dirs): |
Parent Directory
| 
Revision Log