summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>2015-11-19 14:14:18 -0800
committerchrome-bot <chrome-bot@chromium.org>2015-12-16 21:49:34 -0800
commit0e5f54d79158f216edeb42bfe9c5cd6d35dc6e0d (patch)
treef2debdb6b476a1ea954b0ec7b591c589383dc646
parent885b6ae60561c5b864afd94230dd0bdad53ce4d5 (diff)
downloadvboot-stabilize-7797.B.tar.gz
Move default target up so it's really the default.stabilize-smaug-7800.Bstabilize-7797.B
The line ${FUTIL_BIN}: ${UTILLIB21} was changing the default. Change-Id: I7988af498c9a9a1981cf2485e4f9d3496412f133 Reviewed-on: https://chromium-review.googlesource.com/313245 Commit-Ready: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
-rw-r--r--Makefile17
1 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 40d2422c..0a2c23ce 100644
--- a/Makefile
+++ b/Makefile
@@ -251,6 +251,16 @@ endif
export BUILD_RUN
##############################################################################
+# The default target is here, to allow dependencies to be expressed below
+# without accidentally changing the default target.
+
+# Default target.
+.PHONY: all
+all: fwlib fwlib2x fwlib20 fwlib21 \
+ $(if ${FIRMWARE_ARCH},,host_stuff) \
+ $(if ${COV},coverage)
+
+##############################################################################
# Now we need to describe everything we might want or need to build
# Everything wants these headers.
@@ -787,13 +797,6 @@ _dir_create := $(foreach d, \
$(shell find ${SUBDIRS} -name '*.c' -exec dirname {} \; | sort -u), \
$(shell [ -d ${BUILD}/${d} ] || mkdir -p ${BUILD}/${d}))
-
-# Default target.
-.PHONY: all
-all: fwlib fwlib2x fwlib20 fwlib21 \
- $(if ${FIRMWARE_ARCH},,host_stuff) \
- $(if ${COV},coverage)
-
# Host targets
.PHONY: host_stuff
host_stuff: utillib hostlib cgpt utils futil tests utillib21