[xen master] DEPS handling: Use DEPS_RM everywhere

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] DEPS handling: Use DEPS_RM everywhere

patchbot
commit 300929f6e400e6540f8c486ad5dd088335bd07f3
Author:     Ian Jackson <[hidden email]>
AuthorDate: Mon Sep 4 17:46:14 2017 +0100
Commit:     Wei Liu <[hidden email]>
CommitDate: Thu Sep 7 16:21:45 2017 +0100

    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 <[hidden email]>
    CC: Wei Liu <[hidden email]>
    Signed-off-by: Ian Jackson <[hidden email]>
    Acked-by: Jan Beulich <[hidden email]>
    Acked-by: Wei Liu <[hidden email]>
---
 tools/blktap2/Makefile                        | 2 +-
 tools/blktap2/control/Makefile                | 2 +-
 tools/blktap2/lvm/Makefile                    | 2 +-
 tools/blktap2/vhd/Makefile                    | 2 +-
 tools/blktap2/vhd/lib/Makefile                | 2 +-
 tools/console/Makefile                        | 2 +-
 tools/debugger/kdd/Makefile                   | 2 +-
 tools/firmware/hvmloader/Makefile             | 2 +-
 tools/firmware/rombios/32bit/Makefile         | 2 +-
 tools/firmware/rombios/32bit/tcgbios/Makefile | 2 +-
 tools/firmware/rombios/Makefile               | 2 +-
 tools/flask/utils/Makefile                    | 2 +-
 tools/helpers/Makefile                        | 2 +-
 tools/libfsimage/Rules.mk                     | 2 +-
 tools/libs/call/Makefile                      | 2 +-
 tools/libs/devicemodel/Makefile               | 2 +-
 tools/libs/evtchn/Makefile                    | 2 +-
 tools/libs/foreignmemory/Makefile             | 2 +-
 tools/libs/gnttab/Makefile                    | 2 +-
 tools/libs/toollog/Makefile                   | 2 +-
 tools/libvchan/Makefile                       | 2 +-
 tools/libxc/Makefile                          | 2 +-
 tools/libxl/Makefile                          | 2 +-
 tools/memshr/Makefile                         | 2 +-
 tools/misc/Makefile                           | 2 +-
 tools/pygrub/Makefile                         | 2 +-
 tools/python/Makefile                         | 2 +-
 tools/tests/mem-sharing/Makefile              | 2 +-
 tools/tests/xen-access/Makefile               | 2 +-
 tools/tests/xenstore/Makefile                 | 2 +-
 tools/xcutils/Makefile                        | 2 +-
 tools/xenbackendd/Makefile                    | 2 +-
 tools/xenmon/Makefile                         | 2 +-
 tools/xenpaging/Makefile                      | 2 +-
 tools/xenpmd/Makefile                         | 2 +-
 tools/xenstat/libxenstat/Makefile             | 2 +-
 tools/xenstat/xentop/Makefile                 | 2 +-
 tools/xenstore/Makefile                       | 2 +-
 tools/xentrace/Makefile                       | 2 +-
 tools/xl/Makefile                             | 2 +-
 xen/Rules.mk                                  | 2 +-
 xen/xsm/flask/Makefile                        | 2 +-
 42 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile
index f4758ef..f4ac1eb 100644
--- 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 c168283..49ec153 100644
--- 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 72fea0a..4a2e2b5 100644
--- 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 e60b7af..815d151 100644
--- 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 3bf603e..cd2744e 100644
--- 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 abe77b2..d1fedc6 100644
--- 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 bcec440..5509eee 100644
--- 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 7d52ed8..1043823 100644
--- 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 28c1544..f6e0fd4 100644
--- 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 5cff4ef..c5f9004 100644
--- 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 94e65db..2ad165b 100644
--- 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 fc047e9..4c0e052 100644
--- 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 fcfca46..4f3bbe6 100644
--- 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 ee7de44..4d01098 100644
--- 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 bd3d1f0..1ccd5fd 100644
--- 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 e41fd20..f0e1e6c 100644
--- 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 c9537ff..5444ec7 100644
--- 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 b110076..ab7f873 100644
--- 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 3363bd5..afb924f 100644
--- 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 01619ec..8aae2c8 100644
--- 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 277c1c0..4a7e018 100644
--- 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 83e3416..9ae80a7 100644
--- 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 082af8f..bf48897 100644
--- 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 cb5ea61..6321bdd 100644
--- 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 54f6e2e..af579a7 100644
--- 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 3a6074b..acdab8a 100644
--- 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 e7a3c51..012358b 100644
--- 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 d89e283..5d46a3b 100644
--- 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 e11f639..fc6555c 100644
--- 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 6c85f98..dc53519 100644
--- 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 6bc9062..173182f 100644
--- 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 80ac7f4..36c6c6c 100644
--- 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 537c176..b547621 100644
--- 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 ba083ca..7b84c85 100644
--- 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 e0d0697..9d677b8 100644
--- 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 4b94d81..d6a4268 100644
--- 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 2e156f1..ca34135 100644
--- 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 108c942..a6c8ed1 100644
--- 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 bcd8f5b..67ed076 100644
--- 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 ff85d48..92c4c00 100644
--- 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 77bcd44..01aabfe 100644
--- 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 898cc20..e22ed7c 100644
--- 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)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog