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