Patchwork [10/12] Makefile.hw: avoid overly large 'make clean' rm command

login
register
mail settings
Submitter Stefan Hajnoczi
Date June 22, 2012, 9:40 a.m.
Message ID <1340358009-16033-11-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/166556/
State New
Headers show

Comments

Stefan Hajnoczi - June 22, 2012, 9:40 a.m.
From: Peter Maydell <peter.maydell@linaro.org>

Avoid 'make clean' producing an 'rm' command which has a lot
of duplicate 'hw//*.o' arguments, by using $(sort $(dir ..))
rather than $(dir $(sort ..)) so Make's sort function will
remove the duplicates for us. We can also remove the double
'//' safely because $(dir ..) is guaranteed to return a string
ending in '/'.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile.hw |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/Makefile.hw b/Makefile.hw
index 2bcbaff..28fe100 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -19,8 +19,8 @@  all: $(hw-obj-y)
 	@true
 
 clean:
-	rm -f $(addsuffix /*.o, $(dir $(sort $(hw-obj-y))))
-	rm -f $(addsuffix /*.d, $(dir $(sort $(hw-obj-y))))
+	rm -f $(addsuffix *.o, $(sort $(dir $(hw-obj-y))))
+	rm -f $(addsuffix *.d, $(sort $(dir $(hw-obj-y))))
 
 # Include automatically generated dependency files
 -include $(patsubst %.o, %.d, $(hw-obj-y))