From fff4aa914d125442fcfd052993fad9c4bea5f694 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 4 Sep 2017 17:46:15 +0100 Subject: [PATCH] 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 CC: Wei Liu Signed-off-by: Ian Jackson Acked-by: Jan Beulich Acked-by: Wei Liu --- 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/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/golang/xenlight/Makefile | 2 +- tools/libacpi/Makefile | 2 +- tools/libfsimage/Rules.mk | 2 +- tools/libfsimage/common/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 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 49ec153d4d..1ea5df83bc 100644 --- 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 4a2e2b58a4..9ea6969891 100644 --- 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 815d151559..9c4ee8371e 100644 --- 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 cd2744e5de..c4e9ec507c 100644 --- 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 d1fedc6def..c5f3f5cea8 100644 --- 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 104382329f..7c4c0ce535 100644 --- 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 f6e0fd4aee..c058c71551 100644 --- 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 c5f900409a..4dbc713ce0 100644 --- 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 2ad165b034..78237fd736 100644 --- 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 4c0e052636..ae87102144 100644 --- 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 88202a6d5d..0987305224 100644 --- 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 fd7af1bc2b..a47a658a25 100644 --- 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 4d01098cff..eab4ecb35e 100644 --- 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 af6f67e5c7..0791fc9923 100644 --- 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 4a7e018a0a..ca9fc6354e 100644 --- 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 9ae80a7513..9a019e8dfe 100644 --- 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 bf48897412..74c70abcf4 100644 --- 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 6321bdde0c..31d2dd7ada 100644 --- 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 af579a710a..eaa28793ef 100644 --- 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 acdab8ad91..536af07932 100644 --- 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 012358b37d..541858e2f8 100644 --- 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 5d46a3b1d7..497696f19c 100644 --- 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 fc6555c33f..0ca3f6f4c9 100644 --- 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 dc53519db7..b37b90d03a 100644 --- 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 173182fd2a..2811893980 100644 --- 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 36c6c6c09d..ba53bbf7e6 100644 --- 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 b5476211e1..e45c5b8c14 100644 --- 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 7b84c855b4..968678c4e8 100644 --- 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 9d677b885a..e0d3f06ab2 100644 --- 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 d6a4268a0d..8979fa1583 100644 --- 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 ca34135316..ec612db2a2 100644 --- 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 a6c8ed16e7..ff428e2186 100644 --- 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 67ed076bce..0bad942bdf 100644 --- 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 92c4c0095f..d49dc8fa20 100644 --- 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 01aabfe85b..cafc67b86e 100644 --- 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) -- 2.39.5