From 0e5f54d79158f216edeb42bfe9c5cd6d35dc6e0d Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 19 Nov 2015 14:14:18 -0800 Subject: Move default target up so it's really the default. The line ${FUTIL_BIN}: ${UTILLIB21} was changing the default. Change-Id: I7988af498c9a9a1981cf2485e4f9d3496412f133 Reviewed-on: https://chromium-review.googlesource.com/313245 Commit-Ready: Bill Richardson Tested-by: Bill Richardson Reviewed-by: Bill Richardson --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 40d2422c..0a2c23ce 100644 --- a/Makefile +++ b/Makefile @@ -250,6 +250,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 @@ -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 -- cgit v1.2.1