summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-02-12 00:51:05 +0100
committerWolfgang Denk <wd@denx.de>2008-02-12 00:51:05 +0100
commitac2731f185ee4b7f56998c8f26d181f66fad84f8 (patch)
treee8dd06aa713b9caf8dc3882aaf72d47c48fb9f24 /Makefile
parentc62776be8dca4097ca03d4f9415f08d4887b45d0 (diff)
parent63f732d3d3880feb531f48af247c025bf01462b0 (diff)
downloadu-boot-imx-ac2731f185ee4b7f56998c8f26d181f66fad84f8.zip
u-boot-imx-ac2731f185ee4b7f56998c8f26d181f66fad84f8.tar.gz
u-boot-imx-ac2731f185ee4b7f56998c8f26d181f66fad84f8.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index ec8661a..852dca8 100644
--- a/Makefile
+++ b/Makefile
@@ -253,9 +253,7 @@ LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
"post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
LIBS += common/libcommon.a
LIBS += libfdt/libfdt.a
-ifeq ($(CONFIG_API),y)
LIBS += api/libapi.a
-endif
LIBS := $(addprefix $(obj),$(LIBS))
.PHONY : $(LIBS)
@@ -266,11 +264,8 @@ PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -
# The "tools" are needed early, so put this first
# Don't include stuff already done in $(LIBS)
SUBDIRS = tools \
- examples
-
-ifeq ($(CONFIG_API),y)
-SUBDIRS += api_examples
-endif
+ examples \
+ api_examples
.PHONY : $(SUBDIRS)