diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-09-09 20:02:22 +0900 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-10-01 22:44:21 +0200 |
| commit | 7ff525712acf9325e9acdb27bbc93049ea2e850c (patch) | |
| tree | 91cdba6db75d21fb9c50aa89fbba482ba835fd59 | |
| parent | be8af2d54a66911693eddc556e4f7a866670082b (diff) | |
| download | linux-stable-7ff525712acf9325e9acdb27bbc93049ea2e850c.tar.gz linux-stable-7ff525712acf9325e9acdb27bbc93049ea2e850c.tar.bz2 linux-stable-7ff525712acf9325e9acdb27bbc93049ea2e850c.zip | |
kbuild: fake the "Entering directory ..." message more simply
Commit c2e28dc975ea87feed84415006ae143424912ac7
(kbuild: Print the name of the build directory)
added a gimmick to show the "Entering directory ...".
Instead of echoing the hard-coded message (that is, we need to know
the exact message), moving --no-print-directory would be easier.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -10,11 +10,9 @@ NAME = Shuffling Zombie Juror # Comments in this file are targeted only to the developer, do not # expect to learn how to build the kernel reading this file. -# Do not: -# o use make's built-in rules and variables -# (this increases performance and avoids hard-to-debug behaviour); -# o print "Entering directory ..."; -MAKEFLAGS += -rR --no-print-directory +# Do not use make's built-in rules and variables +# (this increases performance and avoids hard-to-debug behaviour); +MAKEFLAGS += -rR # Avoid funny character set dependencies unexport LC_ALL @@ -172,13 +170,7 @@ PHONY += $(MAKECMDGOALS) sub-make $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make @: -# Fake the "Entering directory" message once, so that IDEs/editors are -# able to understand relative filenames. - echodir := @echo - quiet_echodir := @echo -silent_echodir := @: sub-make: FORCE - $($(quiet)echodir) "make[1]: Entering directory \`$(KBUILD_OUTPUT)'" $(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \ KBUILD_SRC=$(CURDIR) \ KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \ @@ -192,6 +184,11 @@ endif # ifeq ($(KBUILD_SRC),) # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) +# Do not print "Entering directory ...", +# but we want to display it when entering to the output directory +# so that IDEs/editors are able to understand relative filenames. +MAKEFLAGS += --no-print-directory + # If building an external module we do not care about the all: rule # but instead _all depend on modules PHONY += all |