From 9ea28cad7d713e938656f6294167dfc80f71e0fa Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 14 Oct 2017 05:17:40 +0200 Subject: Makefile: even prettier output --- src/Makefile | 4 ++++ src/tools/Makefile | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index ec6cfc5..c4ccb55 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,6 +9,10 @@ PWD := $(shell pwd) all: module tools debug: module-debug tools-debug +ifneq ($(V),1) +MAKEFLAGS += --no-print-directory +endif + version.h: @export GIT_CEILING_DIRECTORIES="$$(readlink -f ../..)" && \ ver="#define WIREGUARD_VERSION \"$$(git describe --dirty 2>/dev/null)\"" && \ diff --git a/src/tools/Makefile b/src/tools/Makefile index 01f873c..bd727d4 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -48,10 +48,10 @@ endif ifneq ($(V),1) BUILT_IN_LINK.o := $(LINK.o) -LINK.o = @echo " LD $@"; +LINK.o = @echo " LD $$(pwd)/$@"; LINK.o += $(BUILT_IN_LINK.o) BUILT_IN_COMPILE.c := $(COMPILE.c) -COMPILE.c = @echo " CC $@"; +COMPILE.c = @echo " CC $$(pwd)/$@"; COMPILE.c += $(BUILT_IN_COMPILE.c) endif @@ -59,7 +59,7 @@ wg: $(patsubst %.c,%.o,$(wildcard *.c)) ifneq ($(V),1) clean: - @echo " RM " 'wg *.o *.d' + @echo " CLEAN $$(pwd)/{wg,*.o,*.d}" @$(RM) wg *.o *.d else clean: -- cgit v1.2.3-59-g8ed1b