mirror of
https://github.com/linux-sunxi/u-boot-sunxi.git
synced 2024-02-12 11:16:03 +08:00
Makefile: support descending down to subdirectories
This patch tweaks scripts/Makefile.build to allow the build system to descend into subdirectories like Kbuild. To use this feature, use "obj-y += foo/" syntax. Example: obj-$(CONFIG_FOO) += foo/ Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org>
This commit is contained in:

committed by
Tom Rini

parent
4810400ec9
commit
ac7e735322
@ -19,6 +19,11 @@ obj-y := $(sort $(obj-y))
|
|||||||
extra-y := $(sort $(extra-y))
|
extra-y := $(sort $(extra-y))
|
||||||
lib-y := $(sort $(lib-y))
|
lib-y := $(sort $(lib-y))
|
||||||
|
|
||||||
|
subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y)))
|
||||||
|
obj-y := $(patsubst %/, %/built-in.o, $(obj-y))
|
||||||
|
subdir-obj-y := $(filter %/built-in.o, $(obj-y))
|
||||||
|
subdir-obj-y := $(addprefix $(obj),$(subdir-obj-y))
|
||||||
|
|
||||||
SRCS += $(COBJS:.o=.c) $(SOBJS:.o=.S) \
|
SRCS += $(COBJS:.o=.c) $(SOBJS:.o=.S) \
|
||||||
$(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) $(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S))
|
$(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) $(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S))
|
||||||
OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS) $(obj-y))
|
OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS) $(obj-y))
|
||||||
@ -37,6 +42,14 @@ $(LIBGCC): $(obj).depend $(LGOBJS)
|
|||||||
$(call cmd_link_o_target, $(LGOBJS))
|
$(call cmd_link_o_target, $(LGOBJS))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(subdir-obj-y),)
|
||||||
|
# Descending
|
||||||
|
$(subdir-obj-y): $(subdir-y)
|
||||||
|
|
||||||
|
$(subdir-y): FORCE
|
||||||
|
$(MAKE) -C $@ -f $(TOPDIR)/scripts/Makefile.build
|
||||||
|
endif
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
# defines $(obj).depend target
|
# defines $(obj).depend target
|
||||||
@ -46,3 +59,5 @@ include $(TOPDIR)/rules.mk
|
|||||||
sinclude $(obj).depend
|
sinclude $(obj).depend
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
|
.PHONY: FORCE
|
||||||
|
Reference in New Issue
Block a user