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/xcutils/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'tools/xcutils') diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 15c0c9758e..a8029086b2 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -14,10 +14,6 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) -# Make gcc generate dependencies. -CFLAGS += -Wp,-MD,.$(@F).d -PROG_DEP = .*.d - PROGRAMS = xc_restore xc_save readnotes lsevtchn LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) @@ -40,6 +36,6 @@ install: build .PHONY: clean clean: $(RM) *.o $(PROGRAMS) - $(RM) $(PROG_DEP) + $(RM) $(DEPS) --include $(PROG_DEP) +-include $(DEPS) -- cgit v1.2.3