|
 |
4c0d37 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
4c0d37 |
From: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
Date: Thu, 14 Nov 2019 09:55:07 -0500
|
|
|
4c0d37 |
Subject: [PATCH] make: Make "make clean" use @ and rm -v everywhere
|
|
|
4c0d37 |
|
|
|
4c0d37 |
This makes our "make clean" commands show what they've /removed/, rather
|
|
|
4c0d37 |
than what the shell code that will be run is.
|
|
|
4c0d37 |
|
|
|
4c0d37 |
It also consolidates our list of arches into an ARCHES variable defined
|
|
|
4c0d37 |
in Make.defaults
|
|
|
4c0d37 |
|
|
|
4c0d37 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
---
|
|
|
4c0d37 |
Make.defaults | 2 ++
|
|
|
4c0d37 |
Makefile | 2 +-
|
|
|
4c0d37 |
apps/Makefile | 2 +-
|
|
|
4c0d37 |
gnuefi/Makefile | 2 +-
|
|
|
4c0d37 |
lib/Makefile | 4 ++--
|
|
|
4c0d37 |
5 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
diff --git a/Make.defaults b/Make.defaults
|
|
|
4c0d37 |
index 585f3a00aa5..b8a3e07b681 100755
|
|
|
4c0d37 |
--- a/Make.defaults
|
|
|
4c0d37 |
+++ b/Make.defaults
|
|
|
4c0d37 |
@@ -36,6 +36,8 @@
|
|
|
4c0d37 |
|
|
|
4c0d37 |
TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
+ARCHES=aa64 arm ia32 ia64 mips64el x64
|
|
|
4c0d37 |
+
|
|
|
4c0d37 |
#
|
|
|
4c0d37 |
# Variables below overridable from command-line:
|
|
|
4c0d37 |
# make VARNAME=value ...
|
|
|
4c0d37 |
diff --git a/Makefile b/Makefile
|
|
|
4c0d37 |
index a461a5c3483..eecce6d9736 100644
|
|
|
4c0d37 |
--- a/Makefile
|
|
|
4c0d37 |
+++ b/Makefile
|
|
|
4c0d37 |
@@ -80,7 +80,7 @@ $(SUBDIRS):
|
|
|
4c0d37 |
$(MAKE) -C $(OBJDIR)/$@ -f $(SRCDIR)/$@/Makefile SRCDIR=$(SRCDIR)/$@ ARCH=$(ARCH)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
clean:
|
|
|
4c0d37 |
- rm -f *~
|
|
|
4c0d37 |
+ @rm -vrf *~ $(foreach x,$(ARCHES),$(x)/)
|
|
|
4c0d37 |
@set -e ; for d in $(SUBDIRS); do \
|
|
|
4c0d37 |
if [ -d $(OBJDIR)/$$d ]; then \
|
|
|
4c0d37 |
$(MAKE) -C $(OBJDIR)/$$d -f $(SRCDIR)/$$d/Makefile SRCDIR=$(SRCDIR)/$$d clean; \
|
|
|
4c0d37 |
diff --git a/apps/Makefile b/apps/Makefile
|
|
|
4c0d37 |
index 28088370da7..04cf251cb2f 100644
|
|
|
4c0d37 |
--- a/apps/Makefile
|
|
|
4c0d37 |
+++ b/apps/Makefile
|
|
|
4c0d37 |
@@ -91,7 +91,7 @@ all: $(TARGETS)
|
|
|
4c0d37 |
ctors_test.so : ctors_fns.o ctors_test.o
|
|
|
4c0d37 |
|
|
|
4c0d37 |
clean:
|
|
|
4c0d37 |
- rm -f $(TARGETS) *~ *.o *.so
|
|
|
4c0d37 |
+ @rm -vf $(TARGETS) *~ *.o *.so
|
|
|
4c0d37 |
|
|
|
4c0d37 |
.PHONY: install
|
|
|
4c0d37 |
|
|
|
4c0d37 |
diff --git a/gnuefi/Makefile b/gnuefi/Makefile
|
|
|
4c0d37 |
index df67ee83911..09b40cc421e 100644
|
|
|
4c0d37 |
--- a/gnuefi/Makefile
|
|
|
4c0d37 |
+++ b/gnuefi/Makefile
|
|
|
4c0d37 |
@@ -59,7 +59,7 @@ libgnuefi.a: $(OBJS)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
|
|
|
4c0d37 |
clean:
|
|
|
4c0d37 |
- rm -f $(TARGETS) *~ *.o $(OBJS)
|
|
|
4c0d37 |
+ @rm -vf $(TARGETS) *~ *.o $(OBJS)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
install:
|
|
|
4c0d37 |
mkdir -p $(INSTALLROOT)$(LIBDIR)
|
|
|
4c0d37 |
diff --git a/lib/Makefile b/lib/Makefile
|
|
|
4c0d37 |
index 6fd472ad1ac..4a7619aaacf 100644
|
|
|
4c0d37 |
--- a/lib/Makefile
|
|
|
4c0d37 |
+++ b/lib/Makefile
|
|
|
4c0d37 |
@@ -64,7 +64,7 @@ endif
|
|
|
4c0d37 |
|
|
|
4c0d37 |
OBJS = $(FILES:%=%.o) ctors.o
|
|
|
4c0d37 |
|
|
|
4c0d37 |
-SUBDIRS = ia32 x64 ia64 aa64 arm mips64el runtime
|
|
|
4c0d37 |
+SUBDIRS = $(ARCHES) runtime
|
|
|
4c0d37 |
|
|
|
4c0d37 |
LIBDIRINSTALL = $(INSTALLROOT)$(LIBDIR)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
@@ -78,7 +78,7 @@ libefi.a: $(OBJS)
|
|
|
4c0d37 |
$(AR) $(ARFLAGS) $@ $^
|
|
|
4c0d37 |
|
|
|
4c0d37 |
clean:
|
|
|
4c0d37 |
- rm -f libefi.a *~ $(OBJS) */*.o
|
|
|
4c0d37 |
+ @rm -vf libefi.a *~ $(OBJS) */*.o
|
|
|
4c0d37 |
|
|
|
4c0d37 |
$(LIBDIRINSTALL):
|
|
|
4c0d37 |
mkdir -p $@
|