From 9f8501582f1c60c0a631a89499fb81d8f197fb30 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 12 Jan 2009 10:16:05 +0000 Subject: Use -MMD -MF in tools/* rather than -Wp,-M... If you use -MMD -MF then the correct .o filename is written to the .*.d file as the compiler driver arranges everything. This was done in 19010:275abe1c5d24 for the hypervisor. In this patch we do the same elsewhere in the xen-unstable tree, particularly tools/. Specifically: * Change tools/Rules.mk to add -MMD -MF ... to CFLAGS and set DEPS. * Remove -Wp,-MD... from every other Makefile * Remove setting of DEPS from every other Makefile * Ensure that every Makefile says -include $(DEPS) * Ensure that every Makefile's clean target removes $(DEPS) Some Makefiles were already halfway there, but often for a different variable name eg PROG_DEP. The variable name is now standardised in Rules.mk as DEPS. I have done a test build with this change, on Debian etch. Signed-off-by: Ian Jackson --- tools/xenstat/libxenstat/Makefile | 4 +++- tools/xenstat/xentop/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tools/xenstat') diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 1177b55ac0..b40992959f 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -155,4 +155,6 @@ endif .PHONY: clean clean: rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \ - $(BINDINGS) $(BINDINGSRC) + $(BINDINGS) $(BINDINGSRC) $(DEPS) + +-include $(DEPS) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 4b862a4ec5..15daa39c59 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -37,4 +37,6 @@ endif .PHONY: clean clean: - rm -f xentop xentop.o + rm -f xentop xentop.o $(DEPS) + +-include $(DEPS) -- cgit v1.2.3