DEPS handling: Use DEPS_INCLUDE everywhere

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

This patch is the result of this perl rune:

  git-grep -l 'include.*DEPS' | xargs perl -i -pe 'next unless m/^-?include/; s/\bDEPS\b/DEPS_INCLUDE/'

I have verified that I haven't missed anything, with this rune:

  git-grep '\bDEPS\b'

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/control/Makefile b/tools/blktap2/control/Makefile
index 49ec153d4de768bdffd9754e4191fcd8cb09f895..1ea5df83bc40fe5bfcd7ee2ebbf0c1614c9d901c 100644 (file)
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -104,4 +104,4 @@ distclean: clean
 
 .PHONY: all build clean distclean install uninstall
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile
index 4a2e2b58a4c699a1f477a2c5632280f775e71d53..9ea6969891b5cfc61590fc0a767aff2ea7dee573 100644 (file)
--- a/tools/blktap2/lvm/Makefile
+++ b/tools/blktap2/lvm/Makefile
@@ -35,4 +35,4 @@ distclean: clean
 
 .PHONY: all build clean distclean install lvm-util uninstall
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index 815d1515595c4be4ed8fa8426a8849914d0611a6..9c4ee8371e08f886bc4a51108cd50cf9f94bd8df 100644 (file)
--- a/tools/blktap2/vhd/Makefile
+++ b/tools/blktap2/vhd/Makefile
@@ -52,4 +52,4 @@ distclean: clean
 
 .PHONY: all build clean distclean install uninstall vhd-util vhd-update
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
index cd2744e5de6feabad1b6fcd529cac328df5525c3..c4e9ec507c6b73787a26e60c77ef9dfecdce2277 100644 (file)
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -85,4 +85,4 @@ distclean: clean
 
 .PHONY: all build clean distclean install libvhd uninstall
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/console/Makefile b/tools/console/Makefile
index d1fedc6def081ae249f537d98d9c7b40dcf16816..c5f3f5cea84a5a8c49108a3703f7beb30e0ccac6 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -54,4 +54,4 @@ uninstall:
        rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsole
        rm -f $(DESTDIR)$(sbindir)/xenconsoled
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 104382329ff07e9358e67d96d21d3f8713de7dae..7c4c0ce535a220aad4ad83f6236d1233d0675640 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -122,4 +122,4 @@ clean: subdirs-clean
 .PHONY: distclean
 distclean: clean
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index f6e0fd4aee9dccc501a7c7db5cab33359d20a964..c058c715514c206fb8e32f5d412dbffb9178ecbb 100644 (file)
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -32,4 +32,4 @@ $(TARGET): 32bitbios_all.o
            exit 11;                                         \
          } || :
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile
index c5f900409afeb4b702215bbb1fe710f06101eb92..4dbc713ce0ed8bda0f1b893a5b1ecd9bb4728a70 100644 (file)
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile
@@ -20,4 +20,4 @@ distclean: clean
 $(TARGET): tcgbios.o tpm_drivers.o
        $(LD) $(LDFLAGS_DIRECT) -r $^ -o $@
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile
index 2ad165b034776dbc93ed5f2a405c63350f745049..78237fd736f5d7ba261494613c923c23409475c8 100644 (file)
--- a/tools/firmware/rombios/Makefile
+++ b/tools/firmware/rombios/Makefile
@@ -31,4 +31,4 @@ BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c
 biossums: biossums.c
        gcc -o biossums biossums.c
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile
index 4c0e052636c0668d38808a5d35b0e78c088d09c1..ae87102144d75212c4985150e335305726d485ec 100644 (file)
--- a/tools/flask/utils/Makefile
+++ b/tools/flask/utils/Makefile
@@ -59,4 +59,4 @@ install: all
 uninstall:
        rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(CLIENTS))
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile
index 88202a6d5dce92545eea4328961dfb93ebd447cc..09873052245dfc507221afb7b207c6d6cfd24ca4 100644 (file)
--- a/tools/golang/xenlight/Makefile
+++ b/tools/golang/xenlight/Makefile
@@ -49,4 +49,4 @@ clean:
 .PHONY: distclean
 distclean: clean
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index fd7af1bc2b5c9f2171d252118f36186dd8a7ffe3..a47a658a255f2a2b4b2f04842f913211cfe9543c 100644 (file)
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -102,4 +102,4 @@ distclean: clean
 
 install: all
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index 4d01098cffc17dcc944de38a07d33ba90b810697..eab4ecb35ece2557cfdd5027137548470e09c526 100644 (file)
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -31,4 +31,4 @@ $(FSLIB): $(PIC_OBJS)
 clean distclean::
        rm -f $(PIC_OBJS) $(FSLIB) $(DEPS_RM)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index af6f67e5c79eecbbc20a239e1fab04eb96f94622..0791fc99233dd5ba624b08014cbb558f6004917f 100644 (file)
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -51,5 +51,5 @@ libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR)
 libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
        $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)
 

diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile
index 4a7e018a0a0ab789cb936eea46db045ad6c4103c..ca9fc6354e34cd55f2e8018ee2d3b7b9f0fcdd7d 100644 (file)
--- a/tools/libvchan/Makefile
+++ b/tools/libvchan/Makefile
@@ -86,4 +86,4 @@ clean:
 
 distclean: clean
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 9ae80a75132473e0fb5aa35431e9b6be6906c5fe..9a019e8dfed52e3fac974bbc871fb19a0f9e35af 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -280,5 +280,5 @@ libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
        $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)
 

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index bf488974125ef0141909afe7cae8733a1c291937..74c70abcf4d3cad07d4271d05acb12436bcedb72 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -355,4 +355,4 @@ distclean: clean
 realclean: distclean
        $(RM) -f $(AUTOSRCS) $(AUTOINCS)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile
index 6321bdde0c3631b792f532814dfbc87a32359cce..31d2dd7ada837763fa6e910b09fc7a6206350213 100644 (file)
--- a/tools/memshr/Makefile
+++ b/tools/memshr/Makefile
@@ -46,4 +46,4 @@ distclean: clean
 
 .PHONY: all build clean install distclean uninstall
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index af579a710a5894c95aa22ab0eb5b0eee46642dde..eaa28793ef24391b72ce930e0dcaea2edbf006c2 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -118,4 +118,4 @@ xen-lowmemd: xen-lowmemd.o
 xencov: xencov.o
        $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index acdab8ad91a938a3e55fb83a86cffd8292926527..536af07932b44d99d2e7b6ccab903855ce112573 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -38,4 +38,4 @@ clean:
 .PHONY: distclean
 distclean: clean
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/python/Makefile b/tools/python/Makefile
index 012358b37d68721ee43c8f20764c46e27a63e690..541858e2f886b1136e0657e62bb1c1b0550ba86b 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -44,4 +44,4 @@ clean:
 .PHONY: distclean
 distclean: clean
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/tests/mem-sharing/Makefile b/tools/tests/mem-sharing/Makefile
index 5d46a3b1d7298dff2766e21479d72be61dcc5452..497696f19ce04b8c123113cba77d01f42048df3f 100644 (file)
--- a/tools/tests/mem-sharing/Makefile
+++ b/tools/tests/mem-sharing/Makefile
@@ -26,4 +26,4 @@ distclean: clean
 memshrtool: memshrtool.o
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile
index fc6555c33f59669d32dbdf9f9268dc05822685f8..0ca3f6f4c94ba4ad48bf71ac5e58ff9ecd3685a7 100644 (file)
--- a/tools/tests/xen-access/Makefile
+++ b/tools/tests/xen-access/Makefile
@@ -28,4 +28,4 @@ distclean: clean
 xen-access: xen-access.o Makefile
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenevtchn)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/tests/xenstore/Makefile b/tools/tests/xenstore/Makefile
index dc53519db77e0aaade5d2b69ee810db06e56b730..b37b90d03af7284b386415f46978d78fe124bd9f 100644 (file)
--- a/tools/tests/xenstore/Makefile
+++ b/tools/tests/xenstore/Makefile
@@ -24,4 +24,4 @@ distclean: clean
 xs-test: xs-test.o Makefile
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenstore)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 173182fd2a9c46496a4e6eabd3548bb4f90f0e8d..28118939802cfe3814e1ac97a83ae164d54924bb 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -48,4 +48,4 @@ clean:
 .PHONY: distclean
 distclean: clean
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile
index 36c6c6c09df4c3a09ac606e05c83b2333510bcac..ba53bbf7e6945f3afd1a7bfdbdf8322fb5591d09 100644 (file)
--- a/tools/xenbackendd/Makefile
+++ b/tools/xenbackendd/Makefile
@@ -42,4 +42,4 @@ xenbackendd: xenbackendd.o
 genpath-target = $(call buildmakevars2header,_paths.h)
 $(eval $(genpath-target))
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index b5476211e1151a27bca9b0ab1af439d04b0bf514..e45c5b8c14aab87b5d00265d11aa7cb17da0a90a 100644 (file)
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -55,4 +55,4 @@ xenbaked: xenbaked.o Makefile
 xentrace_setmask: setmask.o Makefile
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index 7b84c855b438c867fe5af9d25828dce65553d0f6..968678c4e8deaf5faec222269c916e0db3d2c472 100644 (file)
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -42,4 +42,4 @@ distclean: clean
 TAGS:
        etags -t $(SRCS) *.h
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
index 9d677b885a0d5f921ca922bb5ce7e58910f88fd1..e0d3f06ab2f86056710141a00e11f034db6cbc62 100644 (file)
--- a/tools/xenpmd/Makefile
+++ b/tools/xenpmd/Makefile
@@ -28,4 +28,4 @@ uninstall:
 xenpmd: xenpmd.o Makefile
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index d6a4268a0d3b6f13ffa5878b0ac00a40c6f8afb2..8979fa1583b2634dee66faafe8feb00dfd936b56 100644 (file)
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -184,7 +184,7 @@ clean:
 .PHONY: distclean
 distclean: clean
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)
 
 genpath-target = $(call buildmakevars2header,src/_paths.h)
 $(eval $(genpath-target))

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index ca34135316be601e0f4abd453f0d7a4cb41391ab..ec612db2a258527c543e45306702df9378c21f01 100644 (file)
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -47,4 +47,4 @@ clean:
 .PHONY: distclean
 distclean: clean
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index a6c8ed16e73916e29c94dcc8a433188583f369af..ff428e218628bcd052057024afc3285add8891cb 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -211,7 +211,7 @@ clients-install: clients
                ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \
        done
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)
 
 # never delete any intermediate files.
 .SECONDARY:

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 67ed076bce555e09b8e0b50d92fd5f770963a425..0bad942bdf794d2a11ee9d93c615391c0c4e9426 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -61,5 +61,5 @@ xentrace_setsize: setsize.o
 xenalyze: xenalyze.o mread.o
        $(CC) $(LDFLAGS) -o $@ $^ $(ARGP_LDFLAGS) $(APPEND_LDFLAGS)
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)
 

diff --git a/tools/xl/Makefile b/tools/xl/Makefile
index 92c4c0095ff35023f1149d8179ddf5472bf5352f..d49dc8fa20b6ea3151add519af8a9758930d750d 100644 (file)
--- a/tools/xl/Makefile
+++ b/tools/xl/Makefile
@@ -57,4 +57,4 @@ clean:
 distclean: clean
 
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 01aabfe85b71f19c57450613a1c01a208f98b47c..cafc67b86e9f530e117f0259e3f76abbc310984c 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -204,4 +204,4 @@ $(filter %.init.o,$(obj-y) $(obj-bin-y) $(extra-y)): %.init.o: %.o Makefile
 %.s: %.S Makefile
        $(CPP) $(AFLAGS) $< -o $@
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)