Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ff52571 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek
Browse files

kbuild: fake the "Entering directory ..." message more simply 



Commit c2e28dc9
(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: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: default avatarPeter Foley <pefoley2@pefoley.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent be8af2d5

Makefile

+8 −11
Original line number Diff line number Diff line
@@ -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

# Do not 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

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