diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-01-12 10:16:05 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-01-12 10:16:05 +0000 |
| commit | 9f8501582f1c60c0a631a89499fb81d8f197fb30 (patch) | |
| tree | 9f7b768cc4205e09038c454d339b871099a7c324 /tools/xenstore | |
| parent | ceff4bb8a36948e4216022511b263831e7e7190f (diff) | |
| download | xen-9f8501582f1c60c0a631a89499fb81d8f197fb30.tar.gz xen-9f8501582f1c60c0a631a89499fb81d8f197fb30.tar.bz2 xen-9f8501582f1c60c0a631a89499fb81d8f197fb30.zip | |
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 <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/xenstore')
| -rw-r--r-- | tools/xenstore/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 9b7e9e89c6..c84505cc3c 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -8,10 +8,6 @@ CFLAGS += -Werror CFLAGS += -I. CFLAGS += $(CFLAGS_libxenctrl) -# Make gcc generate dependencies. -CFLAGS += -Wp,-MD,.$(@F).d -DEP = .*.d - CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS += xenstore-write xenstore-ls @@ -82,7 +78,7 @@ clean: rm -f xenstored xs_random xs_stress xs_crashme rm -f xs_tdb_dump xenstore-control rm -f xenstore $(CLIENTS) - $(RM) $(DEP) + $(RM) $(DEPS) .PHONY: TAGS TAGS: @@ -113,7 +109,7 @@ install: all $(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR) --include $(DEP) +-include $(DEPS) # never delete any intermediate files. .SECONDARY: |