aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Hunt <james.o.hunt@intel.com>2015-11-10 12:01:36 +0000
committerWill Deacon <will.deacon@arm.com>2015-11-11 09:43:54 +0000
commitfbddb64505744b4f78c32910086c14e0305da905 (patch)
treec68c74aaa9ab1a9dd96947f6007c78eba2159a2a
parentb40a51a1cde20250743b84c7a592f1a9942f4ed2 (diff)
downloadkvmtool-fbddb64505744b4f78c32910086c14e0305da905.tar.gz
kvmtool: Makefile: remove static dependency files when make clean
After make lkvm-static & make clean, the dependency files for static objects (.xxx.static.o.d) are not removed. Signed-off-by: Xiaochen Shen <xiaochen.shen@intel.com> Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com> Signed-off-by: James Hunt <james.o.hunt@intel.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8095d598..59622c30 100644
--- a/Makefile
+++ b/Makefile
@@ -369,6 +369,9 @@ c_flags = -Wp,-MD,$(depfile) $(CFLAGS)
#
STATIC_OBJS = $(patsubst %.o,%.static.o,$(OBJS) $(OBJS_STATOPT))
+STATIC_DEPS := $(foreach obj,$(STATIC_OBJS),\
+ $(subst $(comma),_,$(dir $(obj)).$(notdir $(obj)).d))
+
$(PROGRAM)-static: $(STATIC_OBJS) $(OTHEROBJS) $(GUEST_INIT) $(GUEST_PRE_INIT)
$(E) " LINK " $@
$(Q) $(CC) -static $(CFLAGS) $(STATIC_OBJS) $(OTHEROBJS) $(GUEST_OBJS) $(LDFLAGS) $(LIBS) $(LIBS_STATOPT) -o $@
@@ -489,7 +492,7 @@ clean:
$(Q) rm -f x86/bios/bios-rom.h
$(Q) rm -f tests/boot/boot_test.iso
$(Q) rm -rf tests/boot/rootfs/
- $(Q) rm -f $(DEPS) $(OBJS) $(OTHEROBJS) $(OBJS_DYNOPT) $(STATIC_OBJS) $(PROGRAM) $(PROGRAM_ALIAS) $(PROGRAM)-static $(GUEST_INIT) $(GUEST_PRE_INIT) $(GUEST_OBJS)
+ $(Q) rm -f $(DEPS) $(STATIC_DEPS) $(OBJS) $(OTHEROBJS) $(OBJS_DYNOPT) $(STATIC_OBJS) $(PROGRAM) $(PROGRAM_ALIAS) $(PROGRAM)-static $(GUEST_INIT) $(GUEST_PRE_INIT) $(GUEST_OBJS)
$(Q) rm -f cscope.*
$(Q) rm -f tags
$(Q) rm -f TAGS