From 88154678c5e6d0e6e28ca17beb01049a9ea4c0a0 Mon Sep 17 00:00:00 2001
From: Juan Castillo <juan.castillo@arm.com>
Date: Thu, 22 Oct 2015 11:34:44 +0100
Subject: [PATCH] Make: fix dependency files generation

Currently, if no make goal is specified in the command line, 'all'
is assumed by default, but the dependency files are not generated.
This might lead to a successful but inconsistent build. This patch
provides a fix to the problem.

Change-Id: I0148719e114dbdbe46f8a57c7d05da7cbc212c92
---
 Makefile                     | 6 +++---
 make_helpers/build_macros.mk | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 31ac5d6f0..ac059e825 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,9 @@
 VERSION_MAJOR			:= 1
 VERSION_MINOR			:= 1
 
+# Default goal is build all images
+.DEFAULT_GOAL			:= all
+
 include make_helpers/build_macros.mk
 
 ################################################################################
@@ -375,9 +378,6 @@ endif
 # Build targets
 ################################################################################
 
-# Default target
-.DEFAULT_GOAL := all
-
 .PHONY:	all msg_start clean realclean distclean cscope locate-checkpatch checkcodebase checkpatch fiptool fip certtool
 .SUFFIXES:
 
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
index 0e2e2ac9f..9ab6e6488 100644
--- a/make_helpers/build_macros.mk
+++ b/make_helpers/build_macros.mk
@@ -112,6 +112,12 @@ endef
 # Auxiliary macros to build TF images from sources
 ################################################################################
 
+# If no goal is specified in the command line, .DEFAULT_GOAL is used.
+# .DEFAULT_GOAL is defined in the main Makefile before including this file.
+ifeq ($(MAKECMDGOALS),)
+MAKECMDGOALS := $(.DEFAULT_GOAL)
+endif
+
 define match_goals
 $(strip $(foreach goal,$(1),$(filter $(goal),$(MAKECMDGOALS))))
 endef