History

kbuild: simplify modname calculation

modname can be calculated much more simply. If modname-multi is empty, it is a single-used object. So, modname = $(basetarget). Otherwise, modname = $(modname-multi).

Masahiro Yamada committed 8 years ago

Commit fe852ac1 parent c96a2942 files · +1 −18Browse files

Showing the changes to scripts/Makefile.lib (1 of 2 files). Show all

Unified · Split

scripts/Makefile.lib+0−7
@@ -47,11 +47,6 @@ multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m · 46 unmodified lines
47multi-used := $(multi-used-y) $(multi-used-m)47multi-used := $(multi-used-y) $(multi-used-m)
48single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m)))48single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m)))
49 49
50# Build list of the parts of our composite objects, our composite
51# objects depend on those (obviously)
52multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y)))
53multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)))
54
55# $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to50# $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to
56# tell kbuild to descend51# tell kbuild to descend
57subdir-obj-y := $(filter %/built-in.a, $(obj-y))52subdir-obj-y := $(filter %/built-in.a, $(obj-y))
@@ -80,8 +75,6 @@ real-objs-m := $(addprefix $(obj)/,$(real-objs-m)) · 22 unmodified lines
80single-used-m := $(addprefix $(obj)/,$(single-used-m))75single-used-m := $(addprefix $(obj)/,$(single-used-m))
81multi-used-y := $(addprefix $(obj)/,$(multi-used-y))76multi-used-y := $(addprefix $(obj)/,$(multi-used-y))
82multi-used-m := $(addprefix $(obj)/,$(multi-used-m))77multi-used-m := $(addprefix $(obj)/,$(multi-used-m))
83multi-objs-y := $(addprefix $(obj)/,$(multi-objs-y))
84multi-objs-m := $(addprefix $(obj)/,$(multi-objs-m))
85subdir-ym := $(addprefix $(obj)/,$(subdir-ym))78subdir-ym := $(addprefix $(obj)/,$(subdir-ym))
86 79
87# These flags are needed for modversions and compiling, so we define them here80# These flags are needed for modversions and compiling, so we define them here