hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/scripts/Makefile.clean
....@@ -17,17 +17,8 @@
1717 # Figure out what we need to build from the various variables
1818 # ==========================================================================
1919
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-))))
3122
3223 # Add subdir path
3324
....@@ -36,11 +27,15 @@
3627 # build a list of files to remove, usually relative to the current
3728 # directory
3829
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-)
4439
4540 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
4641
....@@ -52,26 +47,14 @@
5247 $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(__clean-files))) \
5348 $(filter $(objtree)/%, $(__clean-files)))
5449
55
-# same as clean-files
56
-
57
-__clean-dirs := $(wildcard \
58
- $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(clean-dirs))) \
59
- $(filter $(objtree)/%, $(clean-dirs)))
60
-
6150 # ==========================================================================
6251
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)
6854
6955 __clean: $(subdir-ymn)
7056 ifneq ($(strip $(__clean-files)),)
71
- +$(call cmd,clean)
72
-endif
73
-ifneq ($(strip $(__clean-dirs)),)
74
- +$(call cmd,cleandir)
57
+ $(call cmd,clean)
7558 endif
7659 @:
7760