From: Simon Glass <sjg@chromium.org>
Date: Tue, 25 Oct 2011 11:29:28 +0000 (+0000)
Subject: sandbox: Adjust Makefile so that standalone/api are not built
X-Git-Tag: v2011.12-rc1~316
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b5728756e8af5633cbda4a1ba08aa244d60e60b5;p=oweals%2Fu-boot.git

sandbox: Adjust Makefile so that standalone/api are not built

The check for sandbox architecture is too early in the Makefile, so
standalone and api are built regardless. This moves the check until
after autoconf.mk has been read.

This fixes a build breakage.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/Makefile b/Makefile
index 82de62b011..bd722862d4 100644
--- a/Makefile
+++ b/Makefile
@@ -142,9 +142,6 @@ unexport CDPATH
 SUBDIR_TOOLS = tools
 SUBDIR_EXAMPLES = examples/standalone examples/api
 SUBDIRS = $(SUBDIR_TOOLS)
-ifndef CONFIG_SANDBOX
-SUBDIRS += $(SUBDIR_EXAMPLES)
-endif
 
 .PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
 
@@ -157,6 +154,10 @@ all:
 sinclude $(obj)include/autoconf.mk.dep
 sinclude $(obj)include/autoconf.mk
 
+ifndef CONFIG_SANDBOX
+SUBDIRS += $(SUBDIR_EXAMPLES)
+endif
+
 # load ARCH, BOARD, and CPU configuration
 include $(obj)include/config.mk
 export	ARCH CPU BOARD VENDOR SOC