3 |
scripts/kconfig/Makefile | 18 ------------------ |
scripts/kconfig/Makefile | 18 ------------------ |
4 |
2 files changed, 10 insertions(+), 27 deletions(-) |
2 files changed, 10 insertions(+), 27 deletions(-) |
5 |
|
|
6 |
diff -Nurp linux-3.0/Makefile linux-3.0-mrproper/Makefile |
diff -Nurp linux-3.2-rc7-mga1/Makefile linux-3.2-rc7-mga1-mrproper/Makefile |
7 |
--- linux-3.0/Makefile 2011-07-15 02:37:36.866554406 +0300 |
--- linux-3.2-rc7-mga1/Makefile 2011-12-24 22:16:36.533460580 +0200 |
8 |
+++ linux-3.0-mrproper/Makefile 2011-07-15 14:14:32.143899236 +0300 |
+++ linux-3.2-rc7-mga1-mrproper/Makefile 2011-12-24 22:17:19.934420956 +0200 |
9 |
@@ -502,8 +502,7 @@ ifeq ($(KBUILD_EXTMOD),) |
@@ -502,8 +502,7 @@ ifeq ($(KBUILD_EXTMOD),) |
10 |
# Carefully list dependencies so we do not try to build scripts twice |
# Carefully list dependencies so we do not try to build scripts twice |
11 |
# in parallel |
# in parallel |
16 |
|
|
17 |
# Objects we will link into vmlinux / subdirs we need to visit |
# Objects we will link into vmlinux / subdirs we need to visit |
18 |
init-y := init/ |
init-y := init/ |
19 |
@@ -986,7 +985,7 @@ prepare0: archprepare FORCE |
@@ -985,7 +984,7 @@ prepare0: archprepare FORCE |
20 |
$(Q)$(MAKE) $(build)=. missing-syscalls |
$(Q)$(MAKE) $(build)=. |
21 |
|
|
22 |
# All the preparing.. |
# All the preparing.. |
23 |
-prepare: prepare0 |
-prepare: prepare0 |
25 |
|
|
26 |
# Generate some files |
# Generate some files |
27 |
# --------------------------------------------------------------------------- |
# --------------------------------------------------------------------------- |
28 |
@@ -1158,11 +1157,13 @@ CLEAN_FILES += vmlinux System.map \ |
@@ -1157,11 +1156,13 @@ CLEAN_FILES += vmlinux System.map \ |
29 |
.tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map |
.tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map |
30 |
|
|
31 |
# Directories & files removed with 'make mrproper' |
# Directories & files removed with 'make mrproper' |
44 |
|
|
45 |
# clean - Delete most, but leave enough to build external modules |
# clean - Delete most, but leave enough to build external modules |
46 |
# |
# |
47 |
@@ -1180,7 +1181,7 @@ clean: archclean |
@@ -1179,7 +1180,7 @@ clean: archclean |
48 |
# |
# |
49 |
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) |
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) |
50 |
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) |
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) |
53 |
|
|
54 |
PHONY += $(mrproper-dirs) mrproper archmrproper |
PHONY += $(mrproper-dirs) mrproper archmrproper |
55 |
$(mrproper-dirs): |
$(mrproper-dirs): |
56 |
diff -Nurp linux-3.0/scripts/kconfig/Makefile linux-3.0-mrproper/scripts/kconfig/Makefile |
diff -Nurp linux-3.2-rc7-mga1/scripts/kconfig/Makefile linux-3.2-rc7-mga1-mrproper/scripts/kconfig/Makefile |
57 |
--- linux-3.0/scripts/kconfig/Makefile 2011-07-15 02:37:27.265495491 +0300 |
--- linux-3.2-rc7-mga1/scripts/kconfig/Makefile 2011-12-24 22:16:36.533460580 +0200 |
58 |
+++ linux-3.0-mrproper/scripts/kconfig/Makefile 2011-07-15 14:13:12.384408058 +0300 |
+++ linux-3.2-rc7-mga1-mrproper/scripts/kconfig/Makefile 2011-12-24 22:17:19.954421398 +0200 |
59 |
@@ -12,26 +12,18 @@ Kconfig := Kconfig |
@@ -12,26 +12,18 @@ Kconfig := Kconfig |
60 |
endif |
endif |
61 |
|
|
81 |
- $(Q)mkdir -p include/generated |
- $(Q)mkdir -p include/generated |
82 |
- $< --$@ $(Kconfig) |
- $< --$@ $(Kconfig) |
83 |
|
|
84 |
# if no path is given, then use src directory to find file |
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile |
85 |
ifdef LSMOD |
$(Q)mkdir -p include/generated |
86 |
@@ -99,26 +91,16 @@ update-po-config: $(obj)/kxgettext $(obj |
@@ -74,26 +66,16 @@ update-po-config: $(obj)/kxgettext $(obj |
87 |
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig |
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig |
88 |
|
|
89 |
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile |
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile |