From 95dbde278c3b72dfb0440ed0d1cf83947fb2c3f1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 18 Mar 2024 13:16:17 +0000 Subject: [PATCH] make: Make "make clean" use @ and rm -v everywhere This makes our "make clean" commands show what they've /removed/, rather than what the shell code that will be run is. Signed-off-by: Richard Hughes Signed-off-by: Peter Jones --- Makefile | 2 +- apps/Makefile | 2 +- gnuefi/Makefile | 2 +- lib/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e58d02a..6f4115c 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ $(SUBDIRS): $(MAKE) -C $(OBJDIR)/$@ -f $(SRCDIR)/$@/Makefile SRCDIR=$(SRCDIR)/$@ ARCH=$(ARCH) clean: - rm -f *~ + @rm -vrf *~ @set -e ; for d in $(SUBDIRS); do \ if [ -d $(OBJDIR)/$$d ]; then \ $(MAKE) -C $(OBJDIR)/$$d -f $(SRCDIR)/$$d/Makefile SRCDIR=$(SRCDIR)/$$d clean; \ diff --git a/apps/Makefile b/apps/Makefile index c4c3853..9e4b2ee 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -92,7 +92,7 @@ all: $(TARGETS) ctors_test.so : ctors_fns.o ctors_test.o clean: - rm -f $(TARGETS) *~ *.o *.so + @rm -vf $(TARGETS) *~ *.o *.so install: mkdir -p $(INSTALLROOT)$(APPSDIR) diff --git a/gnuefi/Makefile b/gnuefi/Makefile index e0c9da8..02e8448 100644 --- a/gnuefi/Makefile +++ b/gnuefi/Makefile @@ -69,7 +69,7 @@ gnu-efi.pc: clean: - rm -f $(TARGETS) *~ *.o $(OBJS) + @rm -vf $(TARGETS) *~ *.o $(OBJS) install: mkdir -p $(INSTALLROOT)$(LIBDIR) diff --git a/lib/Makefile b/lib/Makefile index 4e0c9be..07763de 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -80,7 +80,7 @@ libefi.a: $(OBJS) $(AR) $(ARFLAGS) $@ $^ clean: - rm -f libefi.a *~ $(OBJS) */*.o + @rm -vf libefi.a *~ $(OBJS) */*.o $(LIBDIRINSTALL): mkdir -p $@