change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/scripts/Makefile.clean
..
..
@@ -17,17 +17,8 @@
17
17
 # Figure out what we need to build from the various variables
18
18
 # ==========================================================================
19
19
 
20
-__subdir-y	:= $(patsubst %/,%,$(filter %/, $(obj-y)))
21
-subdir-y	+= $(__subdir-y)
22
-__subdir-m	:= $(patsubst %/,%,$(filter %/, $(obj-m)))
23
-subdir-m	+= $(__subdir-m)
24
-__subdir-	:= $(patsubst %/,%,$(filter %/, $(obj-)))
25
-subdir-		+= $(__subdir-)
26
-
27
-# Subdirectories we need to descend into
28
-
29
-subdir-ym	:= $(sort $(subdir-y) $(subdir-m))
30
-subdir-ymn      := $(sort $(subdir-ym) $(subdir-))
20
+subdir-ymn := $(sort $(subdir-y) $(subdir-m) $(subdir-) \
21
+		$(patsubst %/,%, $(filter %/, $(obj-y) $(obj-m) $(obj-))))
31
22
 
32
23
 # Add subdir path
33
24
 
..
..
@@ -36,11 +27,15 @@
36
27
 # build a list of files to remove, usually relative to the current
37
28
 # directory
38
29
 
39
-__clean-files	:= $(extra-y) $(extra-m) $(extra-)       \
40
-		   $(always) $(targets) $(clean-files)   \
41
-		   $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
42
-		   $(hostlibs-y) $(hostlibs-m) $(hostlibs-) \
43
-		   $(hostcxxlibs-y) $(hostcxxlibs-m)
30
+__clean-files	:= \
31
+	$(clean-files) $(targets) $(hostprogs) $(userprogs) \
32
+	$(extra-y) $(extra-m) $(extra-) \
33
+	$(always-y) $(always-m) $(always-) \
34
+	$(hostprogs-always-y) $(hostprogs-always-m) $(hostprogs-always-) \
35
+	$(userprogs-always-y) $(userprogs-always-m) $(userprogs-always-)
36
+
37
+# deprecated
38
+__clean-files	+= $(always) $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
44
39
 
45
40
 __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
46
41
 
..
..
@@ -52,26 +47,14 @@
52
47
 		   $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(__clean-files))) \
53
48
 		   $(filter $(objtree)/%, $(__clean-files)))
54
49
 
55
-# same as clean-files
56
-
57
-__clean-dirs    := $(wildcard                                               \
58
-		   $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(clean-dirs)))    \
59
-		   $(filter $(objtree)/%, $(clean-dirs)))
60
-
61
50
 # ==========================================================================
62
51
 
63
-quiet_cmd_clean    = CLEAN   $(obj)
64
-      cmd_clean    = rm -f $(__clean-files)
65
-quiet_cmd_cleandir = CLEAN   $(__clean-dirs)
66
-      cmd_cleandir = rm -rf $(__clean-dirs)
67
-
52
+quiet_cmd_clean = CLEAN   $(obj)
53
+      cmd_clean = rm -rf $(__clean-files)
68
54
 
69
55
 __clean: $(subdir-ymn)
70
56
 ifneq ($(strip $(__clean-files)),)
71
-	+$(call cmd,clean)
72
-endif
73
-ifneq ($(strip $(__clean-dirs)),)
74
-	+$(call cmd,cleandir)
57
+	$(call cmd,clean)
75
58
 endif
76
59
 	@:
77
60