From 971faf828d8d243141b7a689a787f335864e37c0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 6 Nov 2013 00:28:20 +0100 Subject: [PATCH] Makefile: fix out-of-tree builds with multiple targets with 'all' For out-of-tree builds, this use-case fails to build: $ make clean all This is because 'all' is filtered-out in the Makefile wrapper, since the wrapper itself has a 'all' target. The 'all' target is just the usual naming for the default target in a Makefile. In fact, the first target is the default one, so we can name it whatever we want. Rename the Makefile wrapper 'all' target to avoid name-clashing. Fixes #6644. Reported-by: Ryan Barnett Signed-off-by: "Yann E. MORIN" Cc: Ryan Barnett Cc: Thomas Petazzoni Tested-by: Ryan Barnett Signed-off-by: Peter Korsgaard --- support/scripts/mkmakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/support/scripts/mkmakefile b/support/scripts/mkmakefile index cef2ec7070..27b15073f3 100755 --- a/support/scripts/mkmakefile +++ b/support/scripts/mkmakefile @@ -32,16 +32,16 @@ MAKEFLAGS += --no-print-directory .PHONY: all \$(MAKECMDGOALS) -all := \$(filter-out all Makefile,\$(MAKECMDGOALS)) +all := \$(filter-out Makefile,\$(MAKECMDGOALS)) -all: +_all: \$(MAKE) \$(MAKEARGS) \$(all) Makefile:; -\$(all): all +\$(all): _all @: -%/: all +%/: _all @: EOF