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/Rules.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools/Rules.mk') diff --git a/tools/Rules.mk b/tools/Rules.mk index a477c8253b..fbd69ea215 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -29,6 +29,10 @@ X11_LDPATH = -L/usr/X11R6/$(LIBLEAFDIR) CFLAGS += -D__XEN_TOOLS__ +# Get gcc to generate the dependencies for us. +CFLAGS += -MMD -MF .$(@F).d +DEPS = .*.d + # Enable implicit LFS support *and* explicit LFS names. CFLAGS += $(shell getconf LFS_CFLAGS) CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE @@ -59,4 +63,3 @@ subdirs-all subdirs-clean subdirs-install: .phony subdir-all-% subdir-clean-% subdir-install-%: .phony $(MAKE) -C $* $(patsubst subdir-%-$*,%,$@) - -- cgit v1.2.3