kbuild: make modules.order rule consistent with built-in.a

# ===========================================================================

# subdir-builtin may contain duplications. Use $(sort ...)

# subdir-builtin and subdir-modorder may contain duplications. Use $(sort ...)

subdir-builtin := $(sort $(filter %/built-in.a, $(real-obj-y)))

subdir-modorder := $(sort $(filter %/modules.order, $(modorder)))

ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)

lib-target := $(obj)/lib.a

# To build objects in subdirs, we need to descend into the directories

$(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ;

$(subdir-modorder): $(obj)/%/modules.order: $(obj)/% ;

#

# Rule to compile a set of .o files into one .a file (without symbol table)

#

# Create commands to either record .ko file or cat modules.order from

# a subdirectory

$(modorder-target): $(subdir-ym) FORCE

$(obj)/modules.order: $(subdir-modorder) FORCE

	$(Q){ $(foreach m, $(modorder), \

	$(if $(filter %/modules.order, $m), cat $m, echo $m);) :; } \

	$(if $(filter $^, $m), cat $m, echo $m);) :; } \

	| $(AWK) '!x[$$0]++' - > $@

#

	$(Q)$(MAKE) $(build)=$@ \

	$(if $(filter $@/, $(KBUILD_SINGLE_TARGETS)),single-build=) \

	need-builtin=$(if $(filter $@/built-in.a, $(subdir-builtin)),1) \

	need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1))

	need-modorder=$(if $(filter $@/modules.order, $(subdir-modorder)),1)

# Add FORCE to the prequisites of a target to force it to be always rebuilt.

# ---------------------------------------------------------------------------

# Determine modorder.

# Unfortunately, we don't have information about ordering between -y

# and -m subdirs.  Just put -y's first.

ifdef need-modorder

modorder	:= $(patsubst %/,%/modules.order, $(filter %/, $(obj-y)) $(obj-m:.o=.ko))

endif

# Handle objects in subdirs

# ---------------------------------------------------------------------------