summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRafal Jaworowski <raj@semihalf.com>2008-01-29 16:57:38 +0100
committerRafal Jaworowski <raj@semihalf.com>2008-01-29 16:57:38 +0100
commit0dc1fc22af86d16993388d9ed9630dbaa2d51826 (patch)
treeda03f3b050381d07ed1a5286d1b7b5ad01924845 /Makefile
parent98b742489c09780be6a832eeaa4e5eff824792bb (diff)
downloadu-boot-imx-0dc1fc22af86d16993388d9ed9630dbaa2d51826.zip
u-boot-imx-0dc1fc22af86d16993388d9ed9630dbaa2d51826.tar.gz
u-boot-imx-0dc1fc22af86d16993388d9ed9630dbaa2d51826.tar.bz2
API: Convert conditional building to the new scheme.
This fixes a build breakage with CONFIG_API enabled, which appeared after the recent changes in the U-Boot build system. Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0f6cc59..3e7cffc 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)