1 |
|
2 |
Makefile | 24 ++++++++++++------------ |
3 |
scripts/kconfig/Makefile | 19 ------------------- |
4 |
2 files changed, 12 insertions(+), 31 deletions(-) |
5 |
|
6 |
diff -Nurp linux-3.12-rc5-mga1/Makefile linux-3.12-rc5-mga1-mrp/Makefile |
7 |
--- linux-3.12-rc5-mga1/Makefile 2013-10-13 15:16:07.515274564 +0300 |
8 |
+++ linux-3.12-rc5-mga1-mrp/Makefile 2013-10-13 15:19:42.226094694 +0300 |
9 |
@@ -513,9 +513,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 |
- asm-generic |
15 |
- $(Q)$(MAKE) $(build)=$(@) |
16 |
+scripts: |
17 |
|
18 |
# Objects we will link into vmlinux / subdirs we need to visit |
19 |
init-y := init/ |
20 |
@@ -838,7 +836,7 @@ prepare0: archprepare FORCE |
21 |
$(Q)$(MAKE) $(build)=. |
22 |
|
23 |
# All the preparing.. |
24 |
-prepare: prepare0 |
25 |
+prepare: |
26 |
|
27 |
# Generate some files |
28 |
# --------------------------------------------------------------------------- |
29 |
@@ -1020,13 +1018,15 @@ endif # CONFIG_MODULES |
30 |
CLEAN_DIRS += $(MODVERDIR) |
31 |
|
32 |
# Directories & files removed with 'make mrproper' |
33 |
-MRPROPER_DIRS += include/config usr/include include/generated \ |
34 |
- arch/*/include/generated |
35 |
-MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ |
36 |
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ |
37 |
- signing_key.priv signing_key.x509 x509.genkey \ |
38 |
- extra_certificates signing_key.x509.keyid \ |
39 |
- signing_key.x509.signer |
40 |
+#MRPROPER_DIRS += include/config usr/include include/generated \ |
41 |
+# arch/*/include/generated |
42 |
+#MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ |
43 |
+# Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ |
44 |
+# signing_key.priv signing_key.x509 x509.genkey \ |
45 |
+# extra_certificates signing_key.x509.keyid \ |
46 |
+# signing_key.x509.signer |
47 |
+MRPROPER_DIRS += "" |
48 |
+MRPROPER_FILES += "" |
49 |
|
50 |
# clean - Delete most, but leave enough to build external modules |
51 |
# |
52 |
@@ -1047,7 +1047,7 @@ clean: archclean vmlinuxclean |
53 |
# |
54 |
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) |
55 |
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) |
56 |
-mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts) |
57 |
+mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook) |
58 |
|
59 |
PHONY += $(mrproper-dirs) mrproper archmrproper |
60 |
$(mrproper-dirs): |
61 |
diff -Nurp linux-3.12-rc5-mga1/scripts/kconfig/Makefile linux-3.12-rc5-mga1-mrp/scripts/kconfig/Makefile |
62 |
--- linux-3.12-rc5-mga1/scripts/kconfig/Makefile 2013-10-13 15:16:07.515274564 +0300 |
63 |
+++ linux-3.12-rc5-mga1-mrp/scripts/kconfig/Makefile 2013-10-13 15:19:42.226094694 +0300 |
64 |
@@ -15,26 +15,18 @@ endif |
65 |
unexport CONFIG_ |
66 |
|
67 |
xconfig: $(obj)/qconf 3rdparty/Makefile |
68 |
- $< $(Kconfig) |
69 |
|
70 |
gconfig: $(obj)/gconf 3rdparty/Makefile |
71 |
- $< $(Kconfig) |
72 |
|
73 |
menuconfig: $(obj)/mconf 3rdparty/Makefile |
74 |
- $< $(Kconfig) |
75 |
|
76 |
config: $(obj)/conf 3rdparty/Makefile |
77 |
- $< --oldaskconfig $(Kconfig) |
78 |
|
79 |
nconfig: $(obj)/nconf 3rdparty/Makefile |
80 |
- $< $(Kconfig) |
81 |
|
82 |
oldconfig: $(obj)/conf 3rdparty/Makefile |
83 |
- $< --$@ $(Kconfig) |
84 |
|
85 |
silentoldconfig: $(obj)/conf 3rdparty/Makefile |
86 |
- $(Q)mkdir -p include/generated |
87 |
- $< --$@ $(Kconfig) |
88 |
|
89 |
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile |
90 |
$(Q)mkdir -p include/generated |
91 |
@@ -77,32 +69,21 @@ update-po-config: $(obj)/kxgettext $(obj |
92 |
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig |
93 |
|
94 |
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile |
95 |
- $< --$@ $(Kconfig) |
96 |
|
97 |
PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig |
98 |
|
99 |
listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile |
100 |
- $< --$@ $(Kconfig) |
101 |
|
102 |
# oldnoconfig is an alias of olddefconfig, because people already are dependent |
103 |
# on its behavior(sets new symbols to their default value but not 'n') with the |
104 |
# counter-intuitive name. |
105 |
oldnoconfig: $(obj)/conf 3rdparty/Makefile |
106 |
- $< --olddefconfig $(Kconfig) |
107 |
|
108 |
savedefconfig: $(obj)/conf 3rdparty/Makefile |
109 |
- $< --$@=defconfig $(Kconfig) |
110 |
|
111 |
defconfig: $(obj)/conf 3rdparty/Makefile |
112 |
-ifeq ($(KBUILD_DEFCONFIG),) |
113 |
- $< --defconfig $(Kconfig) |
114 |
-else |
115 |
- @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" |
116 |
- $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) |
117 |
-endif |
118 |
|
119 |
%_defconfig: $(obj)/conf 3rdparty/Makefile |
120 |
- $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) |
121 |
|
122 |
# Help text used by make help |
123 |
help: |