[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH 3/4] 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@xxxxxxxx>
CC: Wei Liu <wei.liu2@xxxxxxxxxx>
Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 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 49ec153..1ea5df8 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 4a2e2b5..9ea6969 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 815d151..9c4ee83 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 cd2744e..c4e9ec5 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 d1fedc6..c5f3f5c 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 1043823..7c4c0ce 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 f6e0fd4..c058c71 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 c5f9004..4dbc713 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 2ad165b..78237fd 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 4c0e052..ae87102 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 88202a6..0987305 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 fd7af1b..a47a658 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 4d01098..eab4ecb 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 af6f67e..0791fc9 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 4a7e018..ca9fc63 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 9ae80a7..9a019e8 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 bf48897..74c70ab 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 6321bdd..31d2dd7 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 af579a7..eaa2879 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 acdab8a..536af07 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 012358b..541858e 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 5d46a3b..497696f 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 fc6555c..0ca3f6f 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 dc53519..b37b90d 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 173182f..2811893 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 36c6c6c..ba53bbf 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 b547621..e45c5b8 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 7b84c85..968678c 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 9d677b8..e0d3f06 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 d6a4268..8979fa1 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 ca34135..ec612db 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 a6c8ed1..ff428e2 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 67ed076..0bad942 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 8aa8e72..bafd5a8 100644
--- a/tools/xl/Makefile
+++ b/tools/xl/Makefile
@@ -56,4 +56,4 @@ clean:
 distclean: clean
 
 
--include $(DEPS)
+-include $(DEPS_INCLUDE)
diff --git a/xen/Rules.mk b/xen/Rules.mk
index 01aabfe..cafc67b 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.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel

 

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.

Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.