diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2013-10-17 20:38:51 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-31 13:26:44 -0400 |
| commit | ac7e73532242ce350764d8aa8dcddcbd47c0fb71 (patch) | |
| tree | 4869eb09b77ac759cb1425607b27131f44a9580d | |
| parent | 4810400ec963721f0488ba98128955176c1869e1 (diff) | |
| download | blackbird-obmc-uboot-ac7e73532242ce350764d8aa8dcddcbd47c0fb71.tar.gz blackbird-obmc-uboot-ac7e73532242ce350764d8aa8dcddcbd47c0fb71.zip | |
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>
| -rw-r--r-- | scripts/Makefile.build | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index f969ec55bd..2ef7341f37 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -19,6 +19,11 @@ obj-y := $(sort $(obj-y)) extra-y := $(sort $(extra-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) \ $(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)) @@ -37,6 +42,14 @@ $(LIBGCC): $(obj).depend $(LGOBJS) $(call cmd_link_o_target, $(LGOBJS)) 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 @@ -46,3 +59,5 @@ include $(TOPDIR)/rules.mk sinclude $(obj).depend ######################################################################### + +.PHONY: FORCE |
