From 67bd47878d8c60b2d8489562e7a2e613d3842988 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 15 Feb 2017 23:20:27 -0800 Subject: [PATCH] images/Makefile: sanitize cleaning Instead of removing everything by means of a few wildcards, let's properly generate the file names to be removed. [v2: fix a typo, thanks to dsafonov@] [v3: resend with a typo fixed for real, this time] Reviewed-by: Dmitry Safonov Signed-off-by: Kir Kolyshkin Signed-off-by: Andrei Vagin --- images/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/images/Makefile b/images/Makefile index 86a7a0151..c46eb2b87 100644 --- a/images/Makefile +++ b/images/Makefile @@ -105,6 +105,7 @@ $(obj)/%.o: $(obj)/%.pb-c.c $(obj)/%.pb-c.h $(obj)/built-in.o: $(addprefix $(obj)/,$(proto-obj-y)) $(E) " LINK " $@ $(Q) $(LD) $(ldflags-y) -r -o $@ $^ +cleanup-y += $(obj)/built-in.o ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),mrproper) @@ -112,9 +113,7 @@ ifneq ($(MAKECMDGOALS),mrproper) endif endif -mrproper-y += $(obj)/*.pb-c.c $(obj)/*.pb-c.h -cleanup-y += $(obj)/*.o $(obj)/*.d $(obj)/*.s $(obj)/*.i -cleanup-y += $(obj)/google/protobuf/*.d -cleanup-y += $(obj)/google/protobuf/*.h -cleanup-y += $(obj)/google/protobuf/*.c -cleanup-y += $(obj)/google/protobuf/*.o +cleanup-y += $(call cleanify,$(addprefix $(obj)/,$(proto-obj-y))) +cleanup-y += $(call cleanify,$(addprefix $(obj)/,$(proto-obj-y:.o=.pb-c.o))) +mrproper-y += $(addprefix $(obj)/,$(proto-obj-y:.o=.pb-c.c)) +mrproper-y += $(addprefix $(obj)/,$(proto-obj-y:.o=.pb-c.h))