DEPS handling: Use DEPS_RM everywhere

DEPS_RM is currently the same as DEPS, so no functional change.

This patch is the result of two perl runes:

  git-grep -l 'rm.*DEPS' | xargs perl -i~ -pe 'next unless m/^\t+rm\b/; s/\bDEPS\b/DEPS_RM/;'

  git-grep -l 'RM.*DEPS' | xargs perl -i~ -pe 'next unless m/^\t+\$\(RM\)/; s/\bDEPS\b/DEPS_RM/;'

And editing  tools/xenstat/libxenstat/Makefile  by hand.

I verified that I didn't miss anything with this rune:

  git-grep '\bDEPS\b' | grep -v include |less

Reported-by: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile
index f4758ef756c51ca801fe5f9b355b16fe22e60ac1..f4ac1eb8270f07b8f15c3bf4bb58b648d71c1215 100644 (file)
--- a/tools/blktap2/Makefile
+++ b/tools/blktap2/Makefile
@@ -12,7 +12,7 @@ SUBDIRS-$(CONFIG_Linux) += drivers
 SUBDIRS-$(CONFIG_Linux) += control
 
 clean:
-       rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) TAGS
+       rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS_RM) TAGS
 
 distclean: clean
 

diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index c1682836c9f52db1a780e2615d10d294b46d62bd..49ec153d4de768bdffd9754e4191fcd8cb09f895 100644 (file)
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -87,7 +87,7 @@ install: build
        $(INSTALL_DATA) xenblktapctl.pc $(DESTDIR)$(PKG_INSTALLDIR)
 
 clean:
-       rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+       rm -f $(OBJS) $(PICS) $(DEPS_RM) $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
        rm -f $(LIBNAME).so $(LIBSONAME)
        rm -f *~
        rm -f xenblktapctl.pc

diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile
index 72fea0a4c35634155aaefd6480ed5e10ccad211c..4a2e2b58a4c699a1f477a2c5632280f775e71d53 100644 (file)
--- a/tools/blktap2/lvm/Makefile
+++ b/tools/blktap2/lvm/Makefile
@@ -29,7 +29,7 @@ lvm-util: lvm-util.o
        $(CC) -DLVM_UTIL $(LDFLAGS) -o lvm-util lvm-util.c
 
 clean:
-       rm -rf *.o *.opic *~ $(DEPS) $(IBIN)
+       rm -rf *.o *.opic *~ $(DEPS_RM) $(IBIN)
 
 distclean: clean
 

diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index e60b7afbe439bef758393de10c7223c16c6178ef..815d1515595c4be4ed8fa8426a8849914d0611a6 100644 (file)
--- a/tools/blktap2/vhd/Makefile
+++ b/tools/blktap2/vhd/Makefile
@@ -46,7 +46,7 @@ uninstall:
        rm -f $(addprefix $(DESTDIR)$(INST_DIR)/, $(IBIN))
 
 clean: subdirs-clean
-       rm -rf *.o *~ $(DEPS) $(IBIN)
+       rm -rf *.o *~ $(DEPS_RM) $(IBIN)
 
 distclean: clean
 

diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
index 3bf603ef174ef4fe23ae74a88735d6cc2c46bbb6..cd2744e5de6feabad1b6fcd529cac328df5525c3 100644 (file)
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -79,7 +79,7 @@ uninstall:
        rm -f $(DESTDIR)$(INST-DIR)/libvhd.a
 
 clean:
-       rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD)
+       rm -rf *.a *.so* *.o *.opic *~ $(DEPS_RM) $(LIBVHD)
 
 distclean: clean
 

diff --git a/tools/console/Makefile b/tools/console/Makefile
index abe77b2f58d97ecbf96e16640a32dfafa85b0f73..d1fedc6def081ae249f537d98d9c7b40dcf16816 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -19,7 +19,7 @@ all: $(BIN)
 
 .PHONY: clean
 clean:
-       $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS)
+       $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS_RM)
        $(RM) client/*.o daemon/*.o
        $(RM) client/_paths.h
        $(RM) daemon/_paths.h

diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile
index bcec440a7ac1471550ab0f597ab406c72fb19302..5509eee68c0ccbc0ced622e7a33f4f9872a671e6 100644 (file)
--- a/tools/debugger/kdd/Makefile
+++ b/tools/debugger/kdd/Makefile
@@ -16,7 +16,7 @@ kdd: $(OBJS)
 
 .PHONY: clean
 clean:
-       rm -f $(OBJS) $(DEPS) kdd
+       rm -f $(OBJS) $(DEPS_RM) kdd
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 7d52ed84f65f041a0bab16777b395ae5ef6009e7..104382329ff07e9358e67d96d21d3f8713de7dae 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -116,7 +116,7 @@ endif
 .PHONY: clean
 clean: subdirs-clean
        rm -f roms.inc roms.inc.new acpi.h
-       rm -f hvmloader hvmloader.tmp *.o $(DEPS)
+       rm -f hvmloader hvmloader.tmp *.o $(DEPS_RM)
        $(MAKE) -C $(ACPI_PATH)  ACPI_BUILD_DIR=$(CURDIR) clean
 
 .PHONY: distclean

diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index 28c15444aef5cd7824a44a782db849a2c1b1e71f..f6e0fd4aee9dccc501a7c7db5cab33359d20a964 100644 (file)
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -15,7 +15,7 @@ all: subdirs-all
 
 .PHONY: clean
 clean: subdirs-clean
-       rm -rf *.o $(TARGET) $(DEPS)
+       rm -rf *.o $(TARGET) $(DEPS_RM)
 
 .PHONY: distclean
 distclean: subdirs-distclean

diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile
index 5cff4efc60e5fecc19db7ca9b5e3ef55907ef081..c5f900409afeb4b702215bbb1fe710f06101eb92 100644 (file)
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile
@@ -12,7 +12,7 @@ all: $(TARGET)
 
 .PHONY: clean
 clean:
-       rm -rf *.o $(TARGET) $(DEPS)
+       rm -rf *.o $(TARGET) $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile
index 94e65db4c8cc3f8ff9f37d1b45b167ece24032fc..2ad165b034776dbc93ed5f2a405c63350f745049 100644 (file)
--- a/tools/firmware/rombios/Makefile
+++ b/tools/firmware/rombios/Makefile
@@ -13,7 +13,7 @@ clean: subdirs-clean
        rm -f  as86-sym.txt ld86-sym.txt 
        rm -f  rombios*.txt rombios*.sym usage biossums
        rm -f  BIOS-bochs-*
-       rm -f  $(DEPS)
+       rm -f  $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile
index fc047e9fd53bc0289d315a62f0dfe408d4362825..4c0e052636c0668d38808a5d35b0e78c088d09c1 100644 (file)
--- a/tools/flask/utils/Makefile
+++ b/tools/flask/utils/Makefile
@@ -37,7 +37,7 @@ flask-set-bool: set-bool.o
 clean: 
        rm -f *.o *.opic *.so
        rm -f $(CLIENTS)
-       $(RM) $(DEPS)
+       $(RM) $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile
index fcfca462a61689ff0fff6382198d5fafc47a6465..4f3bbe6a7d1da790de362802843d5760a05f6fd5 100644 (file)
--- a/tools/helpers/Makefile
+++ b/tools/helpers/Makefile
@@ -50,7 +50,7 @@ endif
 
 .PHONY: clean
 clean:
-       $(RM) -f *.o $(PROGS) $(DEPS) _paths.h
+       $(RM) -f *.o $(PROGS) $(DEPS_RM) _paths.h
 
 distclean: clean
 

diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index ee7de4457ef55436347a4fc2ef97b3a88e7ba90b..4d01098cffc17dcc944de38a07d33ba90b810697 100644 (file)
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -29,6 +29,6 @@ $(FSLIB): $(PIC_OBJS)
        $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) $(APPEND_LDFLAGS)
 
 clean distclean::
-       rm -f $(PIC_OBJS) $(FSLIB) $(DEPS)
+       rm -f $(PIC_OBJS) $(FSLIB) $(DEPS_RM)
 
 -include $(DEPS)

diff --git a/tools/libs/call/Makefile b/tools/libs/call/Makefile
index bd3d1f06254c68f21e1f4e49996a17e5299834ba..1ccd5fd8b01d36b1547cf1ea3cdc24fc06ddf945 100644 (file)
--- a/tools/libs/call/Makefile
+++ b/tools/libs/call/Makefile
@@ -90,7 +90,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-       rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS)
+       rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS)
        rm -f libxencall.so.$(MAJOR).$(MINOR) libxencall.so.$(MAJOR)
        rm -f headers.chk
        rm -f xencall.pc

diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile
index e41fd208fa382bbd2fe042fa2b333d923c319252..f0e1e6cb488ec2f106c651121e90b6114223e98f 100644 (file)
--- a/tools/libs/devicemodel/Makefile
+++ b/tools/libs/devicemodel/Makefile
@@ -91,7 +91,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-       rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS)
+       rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS)
        rm -f libxendevicemodel.so.$(MAJOR).$(MINOR) libxendevicemodel.so.$(MAJOR)
        rm -f headers.chk
        rm -f xendevicemodel.pc

diff --git a/tools/libs/evtchn/Makefile b/tools/libs/evtchn/Makefile
index c9537ffdb475f3cfa2f9b2c5b7a5b0e074f1d8e8..5444ec73e5430085a52d43121def52901aa96ae5 100644 (file)
--- a/tools/libs/evtchn/Makefile
+++ b/tools/libs/evtchn/Makefile
@@ -89,7 +89,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-       rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS)
+       rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS)
        rm -f libxenevtchn.so.$(MAJOR).$(MINOR) libxenevtchn.so.$(MAJOR)
        rm -f headers.chk
        rm -f xenevtchn.pc

diff --git a/tools/libs/foreignmemory/Makefile b/tools/libs/foreignmemory/Makefile
index b110076621a1688e63e306d74a05a697359f1fbb..ab7f873f261d5f8302c749371762c8b3566a3dd2 100644 (file)
--- a/tools/libs/foreignmemory/Makefile
+++ b/tools/libs/foreignmemory/Makefile
@@ -90,7 +90,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-       rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS)
+       rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS)
        rm -f libxenforeignmemory.so.$(MAJOR).$(MINOR) libxenforeignmemory.so.$(MAJOR)
        rm -f headers.chk
        rm -f xenforeignmemory.pc

diff --git a/tools/libs/gnttab/Makefile b/tools/libs/gnttab/Makefile
index 3363bd55cb81de928c2f9c41bca22db443dbf74d..afb924f55c3265ca76202f775624a2f7ca695a1c 100644 (file)
--- a/tools/libs/gnttab/Makefile
+++ b/tools/libs/gnttab/Makefile
@@ -92,7 +92,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-       rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS)
+       rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS)
        rm -f libxengnttab.so.$(MAJOR).$(MINOR) libxengnttab.so.$(MAJOR)
        rm -f headers.chk
        rm -f xengnttab.pc

diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile
index 01619ec65c10c67162e660944ea6ddd37437b406..8aae2c8f530207125109345c0191c92b0de058e6 100644 (file)
--- a/tools/libs/toollog/Makefile
+++ b/tools/libs/toollog/Makefile
@@ -84,7 +84,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-       rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS)
+       rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS)
        rm -f libxentoollog.so.$(MAJOR).$(MINOR) libxentoollog.so.$(MAJOR)
        rm -f headers.chk
        rm -f xentoollog.pc

diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile
index 277c1c061a508b881f8682336cc6e02e4c6609c2..4a7e018a0a0ab789cb936eea46db045ad6c4103c 100644 (file)
--- a/tools/libvchan/Makefile
+++ b/tools/libvchan/Makefile
@@ -81,7 +81,7 @@ uninstall:
 
 .PHONY: clean
 clean:
-       $(RM) -f *.o *.opic *.so* *.a vchan-node1 vchan-node2 $(DEPS)
+       $(RM) -f *.o *.opic *.so* *.a vchan-node1 vchan-node2 $(DEPS_RM)
        $(RM) -f xenvchan.pc
 
 distclean: clean

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 83e3416309ef97e26df3e0e20ae6e607b83684a9..9ae80a75132473e0fb5aa35431e9b6be6906c5fe 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -225,7 +225,7 @@ TAGS:
 
 .PHONY: clean
 clean:
-       rm -rf *.rpm $(LIB) *~ $(DEPS) \
+       rm -rf *.rpm $(LIB) *~ $(DEPS_RM) \
             _paths.h \
            xencontrol.pc xenguest.pc \
             $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 082af8f716dafad10502130689cd21a48f420b27..bf488974125ef0141909afe7cae8733a1c291937 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -343,7 +343,7 @@ uninstall:
 
 .PHONY: clean
 clean:
-       $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS)
+       $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS_RM)
        $(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check
        $(RM) -f testidl.c.new testidl.c *.api-ok
        $(RM) -f xenlight.pc

diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile
index cb5ea6133838ab13de99088be343b6ad6e17027e..6321bdde0c3631b792f532814dfbc87a32359cce 100644 (file)
--- a/tools/memshr/Makefile
+++ b/tools/memshr/Makefile
@@ -39,7 +39,7 @@ install: all
 uninstall:
 
 clean:
-       rm -rf *.a *.o *~ $(DEPS)
+       rm -rf *.a *.o *~ $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 54f6e2ef53cafd701e46480508d05069dcb66372..af579a710a5894c95aa22ab0eb5b0eee46642dde 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -70,7 +70,7 @@ uninstall:
 
 .PHONY: clean
 clean:
-       $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS)
+       $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 3a6074b7e571ec95cf4b63971a644eb508ed6b90..acdab8ad91a938a3e55fb83a86cffd8292926527 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -33,7 +33,7 @@ uninstall:
 
 .PHONY: clean
 clean:
-       rm -rf build tmp *.pyc *.pyo *.o *.a *~ a.out $(INSTALL_LOG) $(DEPS)
+       rm -rf build tmp *.pyc *.pyo *.o *.a *~ a.out $(INSTALL_LOG) $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/python/Makefile b/tools/python/Makefile
index e7a3c5131acf4dcf2f067a5659f2d2e28f1ba651..012358b37d68721ee43c8f20764c46e27a63e690 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -39,7 +39,7 @@ test:
 clean:
        find . \( -name "*.py[ocd]" -o -name "*~" -o -name "_*.[hc]" \) -delete
        rm -rf build/
-       rm -f $(DEPS)
+       rm -f $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/tests/mem-sharing/Makefile b/tools/tests/mem-sharing/Makefile
index d89e2836fbbba0f87ad4d59ff35ee15c283c7ccd..5d46a3b1d7298dff2766e21479d72be61dcc5452 100644 (file)
--- a/tools/tests/mem-sharing/Makefile
+++ b/tools/tests/mem-sharing/Makefile
@@ -18,7 +18,7 @@ build: $(TARGETS)
 
 .PHONY: clean
 clean:
-       $(RM) *.o $(TARGETS) *~ $(DEPS)
+       $(RM) *.o $(TARGETS) *~ $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile
index e11f639ccf2ac249cafa42645cbb18a32d609a25..fc6555c33f59669d32dbdf9f9268dc05822685f8 100644 (file)
--- a/tools/tests/xen-access/Makefile
+++ b/tools/tests/xen-access/Makefile
@@ -20,7 +20,7 @@ build: $(TARGETS)
 
 .PHONY: clean
 clean:
-       $(RM) *.o $(TARGETS) *~ $(DEPS)
+       $(RM) *.o $(TARGETS) *~ $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/tests/xenstore/Makefile b/tools/tests/xenstore/Makefile
index 6c85f982ed1361dca7a034cd487f488633ce43f0..dc53519db77e0aaade5d2b69ee810db06e56b730 100644 (file)
--- a/tools/tests/xenstore/Makefile
+++ b/tools/tests/xenstore/Makefile
@@ -16,7 +16,7 @@ build: $(TARGETS)
 
 .PHONY: clean
 clean:
-       $(RM) *.o $(TARGETS) *~ $(DEPS)
+       $(RM) *.o $(TARGETS) *~ $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 6bc9062d53f70b49e6561ac2bc417b62d33bf1ae..173182fd2a9c46496a4e6eabd3548bb4f90f0e8d 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -43,7 +43,7 @@ uninstall:
 .PHONY: clean
 clean:
        $(RM) *.o $(PROGRAMS)
-       $(RM) $(DEPS)
+       $(RM) $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile
index 80ac7f4e61e2a0d1d8f7d0317cd0e580d1524c4e..36c6c6c09df4c3a09ac606e05c83b2333510bcac 100644 (file)
--- a/tools/xenbackendd/Makefile
+++ b/tools/xenbackendd/Makefile
@@ -30,7 +30,7 @@ install: build
 
 .PHONY: clean
 clean:
-       $(RM) *.a *.so *.o $(DEPS) xenbackendd _paths.h
+       $(RM) *.a *.so *.o $(DEPS_RM) xenbackendd _paths.h
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index 537c17651b90e401753f54b22ece475eb85f9e92..b5476211e1151a27bca9b0ab1af439d04b0bf514 100644 (file)
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -42,7 +42,7 @@ uninstall:
 
 .PHONY: clean
 clean:
-       $(RM) -f $(DEPS)
+       $(RM) -f $(DEPS_RM)
        $(RM) -f xenbaked xenbaked.o
        $(RM) -f xentrace_setmask setmask.o
 

diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index ba083caaf90bf832c0ec886763ac3b0818276060..7b84c855b438c867fe5af9d25828dce65553d0f6 100644 (file)
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -32,7 +32,7 @@ uninstall:
        rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(IBINS))
 
 clean:
-       rm -f *.o *~ $(DEPS) xen TAGS $(IBINS) $(LIB)
+       rm -f *.o *~ $(DEPS_RM) xen TAGS $(IBINS) $(LIB)
 
 distclean: clean
 

diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
index e0d0697ee0d5b753252e72836d554b4bc80d8af3..9d677b885a0d5f921ca922bb5ce7e58910f88fd1 100644 (file)
--- a/tools/xenpmd/Makefile
+++ b/tools/xenpmd/Makefile
@@ -16,7 +16,7 @@ install: all
 
 .PHONY: clean
 clean:
-       $(RM) -f xenpmd xenpmd.o $(DEPS)
+       $(RM) -f xenpmd xenpmd.o $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 4b94d8175792455350b890961533fb23fdc7538f..d6a4268a0d3b6f13ffa5878b0ac00a40c6f8afb2 100644 (file)
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -178,7 +178,7 @@ endif
 .PHONY: clean
 clean:
        rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \
-             $(BINDINGS) $(BINDINGSRC) $(DEPS) src/_paths.h
+             $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) src/_paths.h
        rm -f xenstat.pc
 
 .PHONY: distclean

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 2e156f14fd48d759fa1378a84e74bf5beb087265..ca34135316be601e0f4abd453f0d7a4cb41391ab 100644 (file)
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -42,7 +42,7 @@ endif
 
 .PHONY: clean
 clean:
-       rm -f xentop xentop.o $(DEPS)
+       rm -f xentop xentop.o $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 108c9421faa3904bf695f1a63c866bbf0df94dc6..a6c8ed16e73916e29c94dcc8a433188583f369af 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -132,7 +132,7 @@ clean:
        rm -f xs_tdb_dump xenstore-control init-xenstore-domain
        rm -f xenstore $(CLIENTS)
        rm -f xenstore.pc
-       $(RM) $(DEPS)
+       $(RM) $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index bcd8f5b1b6aaeb7ecdfeff50090aef9f37b7de74..67ed076bce555e09b8e0b50d92fd5f770963a425 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -44,7 +44,7 @@ endif
 
 .PHONY: clean
 clean:
-       $(RM) *.a *.so *.o *.rpm $(BIN) $(SBIN) $(LIBBIN) $(DEPS)
+       $(RM) *.a *.so *.o *.rpm $(BIN) $(SBIN) $(LIBBIN) $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean

diff --git a/tools/xl/Makefile b/tools/xl/Makefile
index ff85d488d0896663d4f2422c0c9f1c2579bbc2fb..92c4c0095ff35023f1149d8179ddf5472bf5352f 100644 (file)
--- a/tools/xl/Makefile
+++ b/tools/xl/Makefile
@@ -52,7 +52,7 @@ uninstall:
 
 .PHONY: clean
 clean:
-       $(RM) -f *.o xl _paths.h $(DEPS)
+       $(RM) -f *.o xl _paths.h $(DEPS_RM)
 
 distclean: clean
 

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 77bcd449224d27736e40129fc637906762253c91..01aabfe85b71f19c57450613a1c01a208f98b47c 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -166,7 +166,7 @@ FORCE:
 
 .PHONY: clean
 clean:: $(addprefix _clean_, $(subdir-all))
-       rm -f *.o *~ core $(DEPS)
+       rm -f *.o *~ core $(DEPS_RM)
 _clean_%/: FORCE
        $(MAKE) -f $(BASEDIR)/Rules.mk -C $* clean
 

diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile
index 898cc202e26d3510ac2b94422ac1e091cd773a32..e22ed7c03fd826d43548c3d457a735b882d6b85d 100644 (file)
--- a/xen/xsm/flask/Makefile
+++ b/xen/xsm/flask/Makefile
@@ -41,4 +41,4 @@ policy.c: policy.bin gen-policy.py
 
 .PHONY: clean
 clean::
-       rm -f $(ALL_H_FILES) *.o $(DEPS) policy.* $(POLICY_SRC)
+       rm -f $(ALL_H_FILES) *.o $(DEPS_RM) policy.* $(POLICY_SRC)