aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2015-11-25 12:50:25 -0700
committerMartin Roth <martinroth@google.com>2015-12-06 18:35:23 +0100
commitc24f3d615a2a8ed7e251f6ac88d305c8345d3ea3 (patch)
treefae0addca187607aa71243c1252444114f94f832
parent7b45d07cff5827f1014cd704f746b729edbf5c7b (diff)
Makefile: Individualize help targets & set as non-compile targets
- Including the help targets in the list of NOCOMPILE targets means they can run even if the toolchain is mucked up. Since they contain info on building the toolchin, this is useful. - Separate the three current parts of the help target into individual components: help_coreboot, help_toolchain, and help_kconfig. This is mostly for the help_toolchin target which will be printed out by toolchain.inc. Change-Id: I365d95fd63e22bddd122fb1fede6f04270e03d63 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/12542 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--Makefile2
-rw-r--r--Makefile.inc4
-rw-r--r--util/kconfig/Makefile4
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 05da7bee10..99d71395ed 100644
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,7 @@ ifeq ($(strip $(HAVE_DOTCONFIG)),)
NOCOMPILE:=1
endif
ifneq ($(MAKECMDGOALS),)
-ifneq ($(filter %config %clean cross% clang iasl lint% what-jenkins-does,$(MAKECMDGOALS)),)
+ifneq ($(filter %config %clean cross% clang iasl lint% help% what-jenkins-does,$(MAKECMDGOALS)),)
NOCOMPILE:=1
endif
ifeq ($(MAKECMDGOALS), %clean)
diff --git a/Makefile.inc b/Makefile.inc
index 6a553fb6fa..86bddb0265 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -477,8 +477,8 @@ gitconfig:
git config remote.origin.push HEAD:refs/for/master
(git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1)
-help::
- @echo '*** Toolchain ***'
+help_toolchain help::
+ @echo '*** Toolchain targets ***'
@echo ' crossgcc - Build coreboot cross-compilers for all platforms'
@echo ' crosstools - Build coreboot cross-compiler and GDB for all platforms'
@echo ' crossgcc-clean - Remove all built coreboot cross-compilers'
diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
index a468125b3f..cec676b176 100644
--- a/util/kconfig/Makefile
+++ b/util/kconfig/Makefile
@@ -104,8 +104,8 @@ olddefconfig: $(objk)/conf
$< --defconfig=configs/$@ $(Kconfig)
# Help text used by make help
-help::
- @echo '*** Kconfig Help ***'
+help_kconfig help::
+ @echo '*** Kconfig Targets ***'
@echo ' config - Update current config utilising a line-oriented program'
@echo ' nconfig - Update current config utilising a ncurses menu based program'
@echo ' menuconfig - Update current config utilising a menu based program'