From 300929f6e400e6540f8c486ad5dd088335bd07f3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 4 Sep 2017 17:46:14 +0100 Subject: [PATCH] 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 CC: Wei Liu Signed-off-by: Ian Jackson Acked-by: Jan Beulich Acked-by: Wei Liu --- 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 f4758ef756..f4ac1eb827 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 c1682836c9..49ec153d4d 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 72fea0a4c3..4a2e2b58a4 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 e60b7afbe4..815d151559 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 3bf603ef17..cd2744e5de 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 abe77b2f58..d1fedc6def 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 bcec440a7a..5509eee68c 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 7d52ed84f6..104382329f 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 28c15444ae..f6e0fd4aee 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 5cff4efc60..c5f900409a 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 94e65db4c8..2ad165b034 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 fc047e9fd5..4c0e052636 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 fcfca462a6..4f3bbe6a7d 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 ee7de4457e..4d01098cff 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 bd3d1f0625..1ccd5fd8b0 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 e41fd208fa..f0e1e6cb48 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 c9537ffdb4..5444ec73e5 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 b110076621..ab7f873f26 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 3363bd55cb..afb924f55c 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 01619ec65c..8aae2c8f53 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 277c1c061a..4a7e018a0a 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 83e3416309..9ae80a7513 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 082af8f716..bf48897412 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 cb5ea61338..6321bdde0c 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 54f6e2ef53..af579a710a 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 3a6074b7e5..acdab8ad91 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 e7a3c5131a..012358b37d 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 d89e2836fb..5d46a3b1d7 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 e11f639ccf..fc6555c33f 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 6c85f982ed..dc53519db7 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 6bc9062d53..173182fd2a 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 80ac7f4e61..36c6c6c09d 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 537c17651b..b5476211e1 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 ba083caaf9..7b84c855b4 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 e0d0697ee0..9d677b885a 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 4b94d81757..d6a4268a0d 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 2e156f14fd..ca34135316 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 108c9421fa..a6c8ed16e7 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 bcd8f5b1b6..67ed076bce 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 ff85d488d0..92c4c0095f 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 77bcd44922..01aabfe85b 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 898cc202e2..e22ed7c03f 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) -- 2.39.5