diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2013-11-18 11:08:35 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-25 10:41:53 -0500 |
| commit | 8a7e7d5697a8b14ec02731d003bed89b1c54dfb7 (patch) | |
| tree | c6c8656dcdcb4026f8b779075e96542b164e1667 /Makefile | |
| parent | fdb87049d861d92093b382622c9e528405c727f9 (diff) | |
| download | u-boot-imx-8a7e7d5697a8b14ec02731d003bed89b1c54dfb7.zip u-boot-imx-8a7e7d5697a8b14ec02731d003bed89b1c54dfb7.tar.gz u-boot-imx-8a7e7d5697a8b14ec02731d003bed89b1c54dfb7.tar.bz2 | |
Makefile: descend into subdirectories only when CONFIG_API is defined
All objects under api/ and examples/api/ directories are selected
by CONFIG_API.
So we can move CONFIG_API switch to the top Makefile.
In order to use CONFIG_API, the definition of SUBDIR_EXAMPLES-y
must be moved after "sinlude $(obj)include/autoconf.mk".
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -136,7 +136,6 @@ unexport CDPATH # The "examples" conditionally depend on U-Boot (say, when USE_PRIVATE_LIBGCC # is "yes"), so compile examples after U-Boot is compiled. SUBDIR_TOOLS = tools -SUBDIR_EXAMPLES = examples/standalone examples/api SUBDIRS = $(SUBDIR_TOOLS) .PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE) @@ -150,8 +149,10 @@ all: sinclude $(obj)include/autoconf.mk.dep sinclude $(obj)include/autoconf.mk +SUBDIR_EXAMPLES-y := examples/standalone +SUBDIR_EXAMPLES-$(CONFIG_API) += examples/api ifndef CONFIG_SANDBOX -SUBDIRS += $(SUBDIR_EXAMPLES) +SUBDIRS += $(SUBDIR_EXAMPLES-y) endif # load ARCH, BOARD, and CPU configuration @@ -277,7 +278,7 @@ LIBS-y += drivers/usb/phy/ LIBS-y += drivers/usb/ulpi/ LIBS-y += common/ LIBS-y += lib/libfdt/ -LIBS-y += api/ +LIBS-$(CONFIG_API) += api/ LIBS-y += post/ LIBS-y += test/ @@ -362,7 +363,7 @@ endif build := -f $(TOPDIR)/scripts/Makefile.build -C -all: $(ALL-y) $(SUBDIR_EXAMPLES) +all: $(ALL-y) $(SUBDIR_EXAMPLES-y) $(obj)u-boot.dtb: checkdtc $(obj)u-boot $(MAKE) $(build) dts binary @@ -550,7 +551,7 @@ $(LIBS): depend $(SUBDIR_TOOLS) $(SUBDIRS): depend $(MAKE) -C $@ all -$(SUBDIR_EXAMPLES): $(obj)u-boot +$(SUBDIR_EXAMPLES-y): $(obj)u-boot $(LDSCRIPT): depend $(MAKE) -C $(dir $@) $(notdir $@) |