1 |
|
2 |
Makefile | 19 ++++++++++--------- |
3 |
scripts/kconfig/Makefile | 18 ------------------ |
4 |
2 files changed, 10 insertions(+), 27 deletions(-) |
5 |
|
6 |
diff -Nurp linux-3.2-rc7-mga1/Makefile linux-3.2-rc7-mga1-mrproper/Makefile |
7 |
--- linux-3.2-rc7-mga1/Makefile 2011-12-24 22:16:36.533460580 +0200 |
8 |
+++ linux-3.2-rc7-mga1-mrproper/Makefile 2011-12-24 22:17:19.934420956 +0200 |
9 |
@@ -502,8 +502,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 |
@@ -985,7 +984,7 @@ prepare0: archprepare FORCE |
20 |
$(Q)$(MAKE) $(build)=. |
21 |
|
22 |
# All the preparing.. |
23 |
-prepare: prepare0 |
24 |
+prepare: |
25 |
|
26 |
# Generate some files |
27 |
# --------------------------------------------------------------------------- |
28 |
@@ -1157,11 +1156,13 @@ 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 |
- arch/*/include/generated |
34 |
-MRPROPER_FILES += .config .config.old .version .old_version \ |
35 |
- include/linux/version.h \ |
36 |
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS |
37 |
+#MRPROPER_DIRS += include/config usr/include include/generated \ |
38 |
+# arch/*/include/generated |
39 |
+#MRPROPER_FILES += .config .config.old .version .old_version \ |
40 |
+# include/linux/version.h \ |
41 |
+# Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS |
42 |
+MRPROPER_DIRS += "" |
43 |
+MRPROPER_FILES += "" |
44 |
|
45 |
# clean - Delete most, but leave enough to build external modules |
46 |
# |
47 |
@@ -1179,7 +1180,7 @@ clean: archclean |
48 |
# |
49 |
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) |
50 |
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) |
51 |
-mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts) |
52 |
+mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook) |
53 |
|
54 |
PHONY += $(mrproper-dirs) mrproper archmrproper |
55 |
$(mrproper-dirs): |
56 |
diff -Nurp linux-3.2-rc7-mga1/scripts/kconfig/Makefile linux-3.2-rc7-mga1-mrproper/scripts/kconfig/Makefile |
57 |
--- linux-3.2-rc7-mga1/scripts/kconfig/Makefile 2011-12-24 22:16:36.533460580 +0200 |
58 |
+++ linux-3.2-rc7-mga1-mrproper/scripts/kconfig/Makefile 2011-12-24 22:17:19.954421398 +0200 |
59 |
@@ -12,26 +12,18 @@ Kconfig := Kconfig |
60 |
endif |
61 |
|
62 |
xconfig: $(obj)/qconf 3rdparty/Makefile |
63 |
- $< $(Kconfig) |
64 |
|
65 |
gconfig: $(obj)/gconf 3rdparty/Makefile |
66 |
- $< $(Kconfig) |
67 |
|
68 |
menuconfig: $(obj)/mconf 3rdparty/Makefile |
69 |
- $< $(Kconfig) |
70 |
|
71 |
config: $(obj)/conf 3rdparty/Makefile |
72 |
- $< --oldaskconfig $(Kconfig) |
73 |
|
74 |
nconfig: $(obj)/nconf 3rdparty/Makefile |
75 |
- $< $(Kconfig) |
76 |
|
77 |
oldconfig: $(obj)/conf 3rdparty/Makefile |
78 |
- $< --$@ $(Kconfig) |
79 |
|
80 |
silentoldconfig: $(obj)/conf 3rdparty/Makefile |
81 |
- $(Q)mkdir -p include/generated |
82 |
- $< --$@ $(Kconfig) |
83 |
|
84 |
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile |
85 |
$(Q)mkdir -p include/generated |
86 |
@@ -74,26 +66,16 @@ update-po-config: $(obj)/kxgettext $(obj |
87 |
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig |
88 |
|
89 |
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile |
90 |
- $< --$@ $(Kconfig) |
91 |
|
92 |
PHONY += listnewconfig oldnoconfig savedefconfig defconfig |
93 |
|
94 |
listnewconfig oldnoconfig: $(obj)/conf 3rdparty/Makefile |
95 |
- $< --$@ $(Kconfig) |
96 |
|
97 |
savedefconfig: $(obj)/conf 3rdparty/Makefile |
98 |
- $< --$@=defconfig $(Kconfig) |
99 |
|
100 |
defconfig: $(obj)/conf 3rdparty/Makefile |
101 |
-ifeq ($(KBUILD_DEFCONFIG),) |
102 |
- $< --defconfig $(Kconfig) |
103 |
-else |
104 |
- @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" |
105 |
- $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) |
106 |
-endif |
107 |
|
108 |
%_defconfig: $(obj)/conf 3rdparty/Makefile |
109 |
- $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) |
110 |
|
111 |
# Help text used by make help |
112 |
help: |